diff options
author | Tony Wickham <twickham@google.com> | 2018-05-18 17:18:49 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2018-05-18 17:18:49 -0700 |
commit | 8155fa2aa50a4c2ae3d4d1c599d249b6e20ec47d (patch) | |
tree | b73d49f99736ee053c39718fb112f789703ab439 /src | |
parent | 1b74bd652cb4fa8e09590d8aeaaf8a7ff0f92888 (diff) | |
download | android_packages_apps_Trebuchet-8155fa2aa50a4c2ae3d4d1c599d249b6e20ec47d.tar.gz android_packages_apps_Trebuchet-8155fa2aa50a4c2ae3d4d1c599d249b6e20ec47d.tar.bz2 android_packages_apps_Trebuchet-8155fa2aa50a4c2ae3d4d1c599d249b6e20ec47d.zip |
Don't prevent animations in power save mode
Now that batter saver mode doesn't get rid of animations in P, we
shouldn't use custom logic to prevent them either.
Also updated ATLEAST_P to use version code.
Bug: 79990054
Change-Id: If17cf369035c976f3d9d81f35432a045f1956ce5
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Utilities.java | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 5a1c1580a..9ab151231 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -101,7 +101,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch } public final void close(boolean animate) { - animate &= !Utilities.isPowerSaverOn(getContext()); + animate &= !Utilities.isPowerSaverPreventingAnimation(getContext()); handleClose(animate); BaseActivity.fromContext(getContext()).getUserEventDispatcher() .resetElapsedContainerMillis("container closed"); diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 797908261..6c2fd8e53 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -1980,7 +1980,7 @@ public class CellLayout extends ViewGroup { // Animations are disabled in power save mode, causing the repeated animation to jump // spastically between beginning and end states. Since this looks bad, we don't repeat // the animation in power save mode. - if (!Utilities.isPowerSaverOn(getContext())) { + if (!Utilities.isPowerSaverPreventingAnimation(getContext())) { va.setRepeatMode(ValueAnimator.REVERSE); va.setRepeatCount(ValueAnimator.INFINITE); } diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 006dc9590..4bd9a9bf2 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -39,7 +39,6 @@ import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.os.TransactionTooLargeException; -import android.support.v4.os.BuildCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -83,7 +82,8 @@ public final class Utilities { private static final Matrix sMatrix = new Matrix(); private static final Matrix sInverseMatrix = new Matrix(); - public static final boolean ATLEAST_P = BuildCompat.isAtLeastP(); + public static final boolean ATLEAST_P = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.P; public static final boolean ATLEAST_OREO_MR1 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1; @@ -492,7 +492,11 @@ public final class Utilities { LauncherFiles.DEVICE_PREFERENCES_KEY, Context.MODE_PRIVATE); } - public static boolean isPowerSaverOn(Context context) { + public static boolean isPowerSaverPreventingAnimation(Context context) { + if (ATLEAST_P) { + // Battery saver mode no longer prevents animations. + return false; + } PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); return powerManager.isPowerSaveMode(); } |