diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 47ae00c8b..341b3a2b2 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -352,7 +352,7 @@ - diff --git a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java index 38b8951c4..cb177186b 100644 --- a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java +++ b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java @@ -26,7 +26,7 @@ import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.actfm.TagViewActivity; +import com.todoroo.astrid.actfm.TagViewFragment; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmSyncService; import com.todoroo.astrid.actfm.sync.ActFmSyncV2Provider; @@ -232,7 +232,7 @@ public class C2DMReceiver extends BroadcastReceiver { nm.notify(notifId, notification); if(intent.hasExtra("tag_id")) { - Intent broadcastIntent = new Intent(TagViewActivity.BROADCAST_TAG_ACTIVITY); + Intent broadcastIntent = new Intent(TagViewFragment.BROADCAST_TAG_ACTIVITY); broadcastIntent.putExtras(intent); ContextManager.getContext().sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } @@ -359,7 +359,7 @@ public class C2DMReceiver extends BroadcastReceiver { Intent launchIntent = new Intent(context, TaskListActivity.class); launchIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter); - filter.customExtras.putBoolean(TagViewActivity.TOKEN_START_ACTIVITY, shouldLaunchActivity(intent)); + filter.customExtras.putBoolean(TagViewFragment.TOKEN_START_ACTIVITY, shouldLaunchActivity(intent)); launchIntent.putExtras(filter.customExtras); return launchIntent; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 86d6255dc..4c9bba49e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -85,7 +85,7 @@ public class TagSettingsActivity extends FragmentActivity { setupForDialogOrFullscreen(); super.onCreate(savedInstanceState); setContentView(R.layout.tag_settings_activity); - tagData = getIntent().getParcelableExtra(TagViewActivity.EXTRA_TAG_DATA); + tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA); if (tagData == null) { isNewTag = true; tagData = new TagData(); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java index f334284e0..a09f22925 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java @@ -70,7 +70,7 @@ public class TagUpdatesActivity extends ListActivity { super.onCreate(savedInstanceState); ThemeService.applyTheme(this); setContentView(R.layout.tag_updates_activity); - tagData = getIntent().getParcelableExtra(TagViewActivity.EXTRA_TAG_DATA); + tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA); OnTouchListener onTouch = new OnTouchListener() { @Override diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java similarity index 99% rename from astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java rename to astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 8e4be88dd..15c11b579 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -53,7 +53,7 @@ import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.welcome.HelpInfoPopover; -public class TagViewActivity extends TaskListFragment { +public class TagViewFragment extends TaskListFragment { private static final String LAST_FETCH_KEY = "tag-fetch-"; //$NON-NLS-1$ diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 7c99c6cfa..624e078d4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -70,10 +70,10 @@ public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilt Order.asc(Functions.cast(GtasksMetadata.ORDER, "LONG"))).groupBy(Task.ID), //$NON-NLS-1$ values); filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable(R.drawable.gtasks_icon)).getBitmap(); - filter.customTaskList = new ComponentName(ContextManager.getContext(), GtasksListActivity.class); + filter.customTaskList = new ComponentName(ContextManager.getContext(), GtasksListFragment.class); Bundle extras = new Bundle(); extras.putBoolean(TaskListFragment.TOKEN_OVERRIDE_ANIM, true); - extras.putLong(GtasksListActivity.TOKEN_STORE_ID, list.getId()); + extras.putLong(GtasksListFragment.TOKEN_STORE_ID, list.getId()); filter.customExtras = extras; return filter; diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java similarity index 99% rename from astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java rename to astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java index 1d90da513..081a6898a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -24,7 +24,7 @@ import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.sync.GtasksSyncService; -public class GtasksListActivity extends DraggableTaskListFragment { +public class GtasksListFragment extends DraggableTaskListFragment { protected static final int MENU_CLEAR_COMPLETED_ID = MENU_ADDON_INTENT_ID + 1; diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java index 0fcaed8b6..3c9c872cd 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -27,7 +27,7 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; -import com.todoroo.astrid.actfm.TagViewActivity; +import com.todoroo.astrid.actfm.TagViewFragment; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridFilterExposer; @@ -84,14 +84,14 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE newTagIntent(context, RenameTagActivity.class, tag), newTagIntent(context, DeleteTagActivity.class, tag) }; - filter.customTaskList = new ComponentName(ContextManager.getContext(), TagViewActivity.class); + filter.customTaskList = new ComponentName(ContextManager.getContext(), TagViewFragment.class); if(tag.image != null) filter.imageUrl = tag.image; if(tag.updateText != null) filter.updateText = tag.updateText; Bundle extras = new Bundle(); - extras.putString(TagViewActivity.EXTRA_TAG_NAME, tag.tag); - extras.putLong(TagViewActivity.EXTRA_TAG_REMOTE_ID, tag.remoteId); + extras.putString(TagViewFragment.EXTRA_TAG_NAME, tag.tag); + extras.putLong(TagViewFragment.EXTRA_TAG_REMOTE_ID, tag.remoteId); extras.putBoolean(TaskListFragment.TOKEN_OVERRIDE_ANIM, true); filter.customExtras = extras;