Merge "Skip to the end of the folder open animation in battery saver mode." into ub-launcher3-burnaby-polish

am: 6e83dc4031

* commit '6e83dc4031b78ac6e65102b2d936e9e769686fec':
  Skip to the end of the folder open animation in battery saver mode.
This commit is contained in:
Tony Wickham
2015-11-25 00:06:14 +00:00
committed by android-build-merger
3 changed files with 12 additions and 5 deletions

View File

@@ -35,7 +35,6 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
import android.os.Build;
import android.os.Parcelable;
import android.os.PowerManager;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.util.Log;
@@ -2156,10 +2155,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
// 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.
PowerManager powerManager = (PowerManager) getContext()
.getSystemService(Context.POWER_SERVICE);
boolean powerSaverOn = Utilities.ATLEAST_LOLLIPOP && powerManager.isPowerSaveMode();
if (!powerSaverOn) {
if (!Utilities.isPowerSaverOn(getContext())) {
va.setRepeatMode(ValueAnimator.REVERSE);
va.setRepeatCount(ValueAnimator.INFINITE);
}

View File

@@ -3066,6 +3066,10 @@ public class Launcher extends Activity
}
oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration));
oa.start();
if (Utilities.isPowerSaverOn(this)) {
// Animations are disabled in battery saver mode, so just skip to the end state.
oa.end();
}
}
private void shrinkAndFadeInFolderIcon(final FolderIcon fi, boolean animate) {

View File

@@ -46,6 +46,7 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.PaintDrawable;
import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import android.os.Process;
import android.text.Spannable;
import android.text.SpannableString;
@@ -805,4 +806,10 @@ public final class Utilities {
return context.getSharedPreferences(
LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public static boolean isPowerSaverOn(Context context) {
PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
return ATLEAST_LOLLIPOP && powerManager.isPowerSaveMode();
}
}