diff options
author | Kenny Guy <kennyguy@google.com> | 2014-09-16 15:17:58 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-09-18 13:07:49 +0100 |
commit | d794a3f46521b972fa02826d379d1efa112793d2 (patch) | |
tree | eec45aa7526a5984f9a7e99c411c6e337dfa9939 /src/com/android/launcher3/Launcher.java | |
parent | 83e5941d8ef6ca33bdd6278f6089c8d6d00de942 (diff) | |
download | packages_apps_Trebuchet-d794a3f46521b972fa02826d379d1efa112793d2.tar.gz packages_apps_Trebuchet-d794a3f46521b972fa02826d379d1efa112793d2.tar.bz2 packages_apps_Trebuchet-d794a3f46521b972fa02826d379d1efa112793d2.zip |
Update calls now we have an L API version.
Bug: 17543647
Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1b95c2b3f..bd39ea86c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1650,7 +1650,7 @@ public class Launcher extends Activity // TODO(sansid): use the APIs directly when compiling against L sdk. // Currently we use reflection to access the flags and the API to set the transparency // on the System bars. - if (Utilities.isLmp()) { + if (Utilities.isLmpOrAbove()) { try { getWindow().getAttributes().systemUiVisibility |= (View.SYSTEM_UI_FLAG_LAYOUT_STABLE @@ -2809,7 +2809,7 @@ public class Launcher extends Activity Bundle optsBundle = null; if (useLaunchAnimation) { - ActivityOptions opts = Utilities.isLmp() ? + ActivityOptions opts = Utilities.isLmpOrAbove() ? ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim) : ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight()); optsBundle = opts.toBundle(); @@ -2920,7 +2920,7 @@ public class Launcher extends Activity ObjectAnimator oa = LauncherAnimUtils.ofPropertyValuesHolder(mFolderIconImageView, alpha, scaleX, scaleY); - if (Utilities.isLmp()) { + if (Utilities.isLmpOrAbove()) { oa.setInterpolator(new LogDecelerateInterpolator(100, 0)); } oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration)); @@ -3194,7 +3194,7 @@ public class Launcher extends Activity mStateAnimation = null; } - boolean material = Utilities.isLmp(); + boolean material = Utilities.isLmpOrAbove(); final Resources res = getResources(); @@ -3376,7 +3376,7 @@ public class Launcher extends Activity dispatchOnLauncherTransitionStart(toView, animated, false); revealView.setAlpha(initAlpha); - if (Utilities.isLmp()) { + if (Utilities.isLmpOrAbove()) { for (int i = 0; i < layerViews.size(); i++) { View v = layerViews.get(i); if (v != null) { @@ -3431,7 +3431,7 @@ public class Launcher extends Activity mStateAnimation = null; } - boolean material = Utilities.isLmp(); + boolean material = Utilities.isLmpOrAbove(); Resources res = getResources(); final int duration = res.getInteger(R.integer.config_appsCustomizeZoomOutTime); @@ -3651,7 +3651,7 @@ public class Launcher extends Activity dispatchOnLauncherTransitionStart(fromView, animated, false); dispatchOnLauncherTransitionStart(toView, animated, false); - if (Utilities.isLmp()) { + if (Utilities.isLmpOrAbove()) { for (int i = 0; i < layerViews.size(); i++) { View v = layerViews.get(i); if (v != null) { |