openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Don't prevent animations in power save mode" into ub-launcher3-edmonton

This commit is contained in:
Tony Wickham 2018-05-21 17:51:35 +00:00 committed by Android (Google) Code Review
parent 98913d0c95 8155fa2aa5
commit e2116daa88
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/AbstractFloatingView.java
View File

@ -101,7 +101,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
} }
public final void close(boolean animate) { public final void close(boolean animate) {
animate &= !Utilities.isPowerSaverOn(getContext()); animate &= !Utilities.isPowerSaverPreventingAnimation(getContext());
handleClose(animate); handleClose(animate);
BaseActivity.fromContext(getContext()).getUserEventDispatcher() BaseActivity.fromContext(getContext()).getUserEventDispatcher()
.resetElapsedContainerMillis("container closed"); .resetElapsedContainerMillis("container closed");

2
src/com/android/launcher3/CellLayout.java
View File

@ -1980,7 +1980,7 @@ public class CellLayout extends ViewGroup {
// Animations are disabled in power save mode, causing the repeated animation to jump // 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 // spastically between beginning and end states. Since this looks bad, we don't repeat
// the animation in power save mode. // the animation in power save mode.
if (!Utilities.isPowerSaverOn(getContext())) { if (!Utilities.isPowerSaverPreventingAnimation(getContext())) {
va.setRepeatMode(ValueAnimator.REVERSE); va.setRepeatMode(ValueAnimator.REVERSE);
va.setRepeatCount(ValueAnimator.INFINITE); va.setRepeatCount(ValueAnimator.INFINITE);
} }

10
src/com/android/launcher3/Utilities.java
View File

@ -39,7 +39,6 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.TransactionTooLargeException; import android.os.TransactionTooLargeException;
import android.support.v4.os.BuildCompat;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.TextUtils; import android.text.TextUtils;
@ -83,7 +82,8 @@ public final class Utilities {
private static final Matrix sMatrix = new Matrix(); private static final Matrix sMatrix = new Matrix();
private static final Matrix sInverseMatrix = 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 = public static final boolean ATLEAST_OREO_MR1 =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_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); 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); PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
return powerManager.isPowerSaveMode(); return powerManager.isPowerSaveMode();
} }