diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java index 38abeb564..5c987774c 100644 --- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java @@ -500,6 +500,14 @@ public class AndroidUtilities { } } + public static void callOverridePendingTransition(Activity activity, int enterAnim, int exitAnim) { + callApiMethod(5, + activity, + "overridePendingTransition", //$NON-NLS-1$ + new Class[] { Integer.TYPE, Integer.TYPE }, + enterAnim, exitAnim); + } + /** * Call a method via reflection if API level is at least minSdk * @param minSdk minimum sdk number (i.e. 8) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 543603bed..57a7bd1e3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -195,9 +195,7 @@ public class TagSettingsActivity extends Activity { intent.putExtra(TagViewActivity.TOKEN_FILTER, TagFilterExposer.filterFromTagData(this, tagData)); super.finish(); startActivity(intent); - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out); return; } @@ -213,13 +211,9 @@ public class TagSettingsActivity extends Activity { private void finishWithAnimation(boolean backAnimation) { super.finish(); if (backAnimation) { - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_right_in, R.anim.slide_right_out); } else { - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out); } } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java index e99bbf672..600480a88 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java @@ -181,9 +181,7 @@ public class TagUpdatesActivity extends ListActivity { @Override public void finish() { super.finish(); - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_right_in, R.anim.slide_right_out); } @Override diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index 76ecb82a3..00de86779 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -132,9 +132,7 @@ public class TagViewActivity extends TaskListActivity { Intent intent = new Intent(getActivity(), TagUpdatesActivity.class); intent.putExtra(EXTRA_TAG_DATA, tagData); startActivity(intent); - AndroidUtilities.callApiMethod(5, TagViewActivity.this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } }); } @@ -149,9 +147,7 @@ public class TagViewActivity extends TaskListActivity { Intent intent = new Intent(getActivity(), TagSettingsActivity.class); intent.putExtra(EXTRA_TAG_DATA, tagData); startActivityForResult(intent, REQUEST_CODE_SETTINGS); - AndroidUtilities.callApiMethod(5, TagViewActivity.this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } }; @@ -243,9 +239,7 @@ public class TagViewActivity extends TaskListActivity { Intent i = new Intent(getActivity(), TagUpdatesActivity.class); i.putExtra(EXTRA_TAG_DATA, tagData); startActivity(i); - AndroidUtilities.callApiMethod(5, TagViewActivity.this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } }, 500); } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java index 9f0c19d6f..d38ef8692 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/FilterByTagExposer.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import android.app.Activity; import android.app.AlertDialog; import android.app.PendingIntent; import android.content.BroadcastReceiver; @@ -110,11 +111,8 @@ public class FilterByTagExposer extends BroadcastReceiver { tagIntent.putExtra(TaskListActivity.TOKEN_FILTER, tagFilter); ContextManager.getContext().startActivity(tagIntent); - AndroidUtilities.callApiMethod(5, - this, - "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + if (ContextManager.getContext() instanceof Activity) + AndroidUtilities.callOverridePendingTransition((Activity) ContextManager.getContext(), R.anim.slide_left_in, R.anim.slide_left_out); } }; diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index a61bc8536..3dfb9d449 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -232,7 +232,7 @@ diff --git a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java index 06c525a89..4f3b6d5c3 100644 --- a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java @@ -61,9 +61,7 @@ public class AstridWrapperActivity extends FragmentActivity intent.putExtra(TaskListActivity.TOKEN_OVERRIDE_ANIM, true); startActivityForResult(intent, FilterListActivity.REQUEST_VIEW_TASKS); } - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out); StatisticsService.reportEvent(StatisticsConstants.FILTER_LIST); return true; } else if(item instanceof SearchFilter) { @@ -93,9 +91,8 @@ public class AstridWrapperActivity extends FragmentActivity tasklist.onNewIntent(intent); } - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - 0, 0); + // no animation for dualpane-layout + AndroidUtilities.callOverridePendingTransition(this, 0, 0); StatisticsService.reportEvent(StatisticsConstants.FILTER_LIST); return true; } else if(item instanceof IntentFilter) { diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java index 022b87fed..10f75f347 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java @@ -191,9 +191,7 @@ public class FilterListActivity extends ExpandableListFragment { @Override public void onClick(View v) { getActivity().finish(); - AndroidUtilities.callApiMethod(5, getActivity(), "overridePendingTransition", //$NON-NLS-1$ - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } }); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index 285e6144a..affee3b6c 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -738,9 +738,7 @@ public final class TaskEditActivity extends Fragment { // abandon editing and delete the newly created task if // no title was entered if (overrideFinishAnim) { - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out); } if(title.getText().length() == 0 && isNewTask && model.isSaved()) { diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index fe5598966..7529e11f7 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -343,9 +343,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, startActivity(intent); getActivity().finish(); if (overrideFinishAnim) { - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out); } return; } else if(extras != null && extras.containsKey(TOKEN_FILTER)) { @@ -570,9 +568,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, } public void transitionForTaskEdit() { - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } private void setUpBackgroundJobs() { @@ -753,9 +749,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, if(requestCode == ACTIVITY_SETTINGS && resultCode == EditPreferences.RESULT_CODE_THEME_CHANGED) { getActivity().finish(); if (overrideFinishAnim) { - AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out); } getActivity().startActivity(getActivity().getIntent()); } @@ -1349,10 +1343,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, Intent intent = new Intent(getActivity(), FilterListWrapperActivity.class); startActivity(intent); - // FIXME animations - AndroidUtilities.callApiMethod(5, getActivity(), "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_right_in, R.anim.slide_right_out); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out); } @Override diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 7ae4b2360..0a89ca2b8 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -918,9 +918,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { Intent intent = new Intent(fragment.getActivity(), TaskEditWrapperActivity.class); intent.putExtra(TaskEditActivity.TOKEN_ID, taskId); fragment.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK); - AndroidUtilities.callApiMethod(5, fragment, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(fragment.getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } else { flushSpecific(taskId); try { @@ -980,9 +978,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { Intent intent = new Intent(fragment.getActivity(), TaskEditWrapperActivity.class); intent.putExtra(TaskEditActivity.TOKEN_ID, taskId); fragment.getActivity().startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK); - AndroidUtilities.callApiMethod(5, fragment, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(fragment.getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } } else if (!viewHolder.task.getFlag(Task.FLAGS, Task.FLAG_IS_READONLY)) { // Register a temporary receiver in case we clicked a task with no actions forthcoming and should start @@ -1009,9 +1005,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { Intent editIntent = new Intent(fragment.getActivity(), TaskEditWrapperActivity.class); editIntent.putExtra(TaskEditActivity.TOKEN_ID, taskId); fragment.getActivity().startActivityForResult(editIntent, TaskListActivity.ACTIVITY_EDIT_TASK); - AndroidUtilities.callApiMethod(5, fragment, "overridePendingTransition", - new Class[] { Integer.TYPE, Integer.TYPE }, - R.anim.slide_left_in, R.anim.slide_left_out); + AndroidUtilities.callOverridePendingTransition(fragment.getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); } } fragment.getActivity().unregisterReceiver(this);