From fac536ad5ce5412e3a60cb0865c713b4f60dc131 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 26 Aug 2010 00:53:34 -0700 Subject: [PATCH] Re-activated override pending transition for leaving task list activity to filter, made swiping anim faster --- astrid/res/anim/slide_left_in.xml | 2 +- astrid/res/anim/slide_left_out.xml | 2 +- astrid/res/anim/slide_right_in.xml | 2 +- astrid/res/anim/slide_right_out.xml | 2 +- astrid/res/raw/gestures | Bin 247 -> 403 bytes .../astrid/activity/FilterListActivity.java | 4 ++++ .../astrid/activity/TaskListActivity.java | 14 +++++++------- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/astrid/res/anim/slide_left_in.xml b/astrid/res/anim/slide_left_in.xml index 21c6a2759..f3ef425d5 100644 --- a/astrid/res/anim/slide_left_in.xml +++ b/astrid/res/anim/slide_left_in.xml @@ -15,5 +15,5 @@ --> - + diff --git a/astrid/res/anim/slide_left_out.xml b/astrid/res/anim/slide_left_out.xml index 62196b2d4..eb9a036ed 100644 --- a/astrid/res/anim/slide_left_out.xml +++ b/astrid/res/anim/slide_left_out.xml @@ -15,5 +15,5 @@ --> - + diff --git a/astrid/res/anim/slide_right_in.xml b/astrid/res/anim/slide_right_in.xml index 819586288..4b235d16d 100644 --- a/astrid/res/anim/slide_right_in.xml +++ b/astrid/res/anim/slide_right_in.xml @@ -15,5 +15,5 @@ --> - + diff --git a/astrid/res/anim/slide_right_out.xml b/astrid/res/anim/slide_right_out.xml index d3c0c492c..e6f1d65e9 100644 --- a/astrid/res/anim/slide_right_out.xml +++ b/astrid/res/anim/slide_right_out.xml @@ -15,5 +15,5 @@ --> - + diff --git a/astrid/res/raw/gestures b/astrid/res/raw/gestures index 94c18d5276cb502d50e2f948cb1943534fd5f505..474194b84b9e6888496950805e10afc90944abd3 100644 GIT binary patch literal 403 zcmZQzWME)mV&KS2EQ`-cO)CNNfFg`qYcmzsLf8zf&UYIaoTmYKAi%!#kMjfu2IrX& zE(81WLry?B=UEL90rr(800Jvi{9{>OV diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java index 5053ddc64..47d4d104c 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java @@ -40,6 +40,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.sql.Functions; import com.todoroo.andlib.sql.QueryTemplate; +import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterCategory; @@ -205,6 +206,9 @@ public class FilterListActivity extends ExpandableListActivity { Intent intent = new Intent(FilterListActivity.this, TaskListActivity.class); intent.putExtra(TaskListActivity.TOKEN_FILTER, filter); 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); return true; } else if(item instanceof SearchFilter) { onSearchRequested(); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index b042de133..a7ebfde02 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -281,9 +281,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, Intent intent = new Intent(TaskListActivity.this, FilterListActivity.class); startActivity(intent); - if(AndroidUtilities.getSdkVersion() >= 5) { - //overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out); - } + AndroidUtilities.callApiMethod(5, TaskListActivity.this, "overridePendingTransition", //$NON-NLS-1$ + new Class[] { Integer.TYPE, Integer.TYPE }, + R.anim.slide_right_in, R.anim.slide_right_out); } }); @@ -974,13 +974,13 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, @SuppressWarnings("nls") @Override public void gesturePerformed(String gesture) { - if("nav_filters".equals(gesture)) { + if("nav_right".equals(gesture)) { Intent intent = new Intent(TaskListActivity.this, FilterListActivity.class); startActivity(intent); - if(AndroidUtilities.getSdkVersion() >= 5) { - // overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out); - } + AndroidUtilities.callApiMethod(5, this, "overridePendingTransition", + new Class[] { Integer.TYPE, Integer.TYPE }, + R.anim.slide_right_in, R.anim.slide_right_out); } }