diff options
| author | John Hoford <hoford@google.com> | 2013-02-12 09:05:39 -0800 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-02-12 09:05:39 -0800 |
| commit | c364d9f2de28f79c636fcb145c355da52f52b7ad (patch) | |
| tree | 4ba68394a62eb324f577c4abec948873d5c36127 | |
| parent | e2c4d033de164d886af9d242d8672570730580d6 (diff) | |
| download | android_packages_apps_Gallery2-c364d9f2de28f79c636fcb145c355da52f52b7ad.tar.gz android_packages_apps_Gallery2-c364d9f2de28f79c636fcb145c355da52f52b7ad.tar.bz2 android_packages_apps_Gallery2-c364d9f2de28f79c636fcb145c355da52f52b7ad.zip | |
remove animations if before Jelly Bean
Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
| -rw-r--r-- | res/layout/filtershow_activity.xml | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 8 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 29 |
3 files changed, 28 insertions, 10 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index e42839b03..20b0ece7e 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -52,7 +52,6 @@ android:id="@+id/mainPanel" android:layout_width="match_parent" android:layout_height="match_parent" - android:layerType="hardware" android:orientation="vertical" > <FrameLayout diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 759b51e07..d7ec4c1bd 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -874,6 +874,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, }).start(); } else { view.setX(translate); + viewList.setAlpha(0); + viewList.setVisibility(View.VISIBLE); + viewList.animate().setDuration(100) + .alpha(1.0f).start(); } } else { mShowingImageStatePanel = false; @@ -940,6 +944,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, }).start(); } else { view.setX(translate); + viewList.setAlpha(0); + viewList.setVisibility(View.VISIBLE); + viewList.animate().setDuration(100) + .alpha(1.0f).start(); } } else { mShowingHistoryPanel = false; diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index a8ec3c236..561ac6c81 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -50,7 +50,11 @@ public class PanelController implements OnClickListener { private boolean mFixedAspect = false; public static boolean useAnimations() { - return true; + int currentapiVersion = android.os.Build.VERSION.SDK_INT; + if (currentapiVersion >= android.os.Build.VERSION_CODES.JELLY_BEAN) { + return true; + } + return false; } public void setFixedAspect(boolean t) { @@ -205,12 +209,16 @@ public class PanelController implements OnClickListener { mView.setY(0); int h = mRowPanel.getHeight(); anim.y(-h); - anim.setDuration(ANIM_DURATION).withLayer().withEndAction(new Runnable() { - @Override - public void run() { - mView.setVisibility(View.GONE); - } - }); + if (PanelController.useAnimations()) { + anim.setDuration(ANIM_DURATION).withLayer().withEndAction(new Runnable() { + @Override + public void run() { + mView.setVisibility(View.GONE); + } + }); + } else { + mView.setVisibility(View.GONE); + } mSelected = false; return anim; } @@ -221,10 +229,13 @@ public class PanelController implements OnClickListener { mView.setX(0); mView.setY(-h); updateText(); + mSelected = true; ViewPropertyAnimator anim = mView.animate(); anim.y(0); - anim.setDuration(ANIM_DURATION).withLayer(); - mSelected = true; + anim.setDuration(ANIM_DURATION); + if (PanelController.useAnimations()) { + anim.withLayer(); + } return anim; } |