Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix charging animation clipping" into qt-dev

Browse Source 
am: 6df373efdd

Change-Id: I7af939b05d55a2a3cb369cb51b6737a7f9d3917b
This commit is contained in:
Lucas Dupin
2019-06-06 14:18:23 -07:00
committed by android-build-merger
parent 521702935c 6df373efdd
commit acd4f43fed
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -43,6 +43,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats; import com.android.internal.app.IBatteryStats;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.ViewClippingUtil;
import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
@@ -119,6 +120,13 @@ public class KeyguardIndicationController implements StateListener,
private final DevicePolicyManager mDevicePolicyManager; private final DevicePolicyManager mDevicePolicyManager;
private boolean mDozing; private boolean mDozing;
private final ViewClippingUtil.ClippingParameters mClippingParams =
new ViewClippingUtil.ClippingParameters() {
@Override
public boolean shouldFinish(View view) {
return view == mIndicationArea;
}
};
/** /**
* Creates a new KeyguardIndicationController and registers callbacks. * Creates a new KeyguardIndicationController and registers callbacks.
@@ -415,6 +423,7 @@ public class KeyguardIndicationController implements StateListener,
R.integer.wired_charging_keyguard_text_animation_duration_down); R.integer.wired_charging_keyguard_text_animation_duration_down);
textView.animate().cancel(); textView.animate().cancel();
float translation = textView.getTranslationY(); float translation = textView.getTranslationY();
ViewClippingUtil.setClippingDeactivated(textView, true, mClippingParams);
textView.animate() textView.animate()
.translationYBy(yTranslation) .translationYBy(yTranslation)
.setInterpolator(Interpolators.LINEAR) .setInterpolator(Interpolators.LINEAR)
@@ -436,6 +445,8 @@ public class KeyguardIndicationController implements StateListener,
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
if (mCancelled) { if (mCancelled) {
ViewClippingUtil.setClippingDeactivated(textView, false,
mClippingParams);
return; return;
} }
textView.animate() textView.animate()
@@ -447,6 +458,12 @@ public class KeyguardIndicationController implements StateListener,
public void onAnimationCancel(Animator animation) { public void onAnimationCancel(Animator animation) {
textView.setTranslationY(translation); textView.setTranslationY(translation);
} }
@Override
public void onAnimationEnd(Animator animation) {
ViewClippingUtil.setClippingDeactivated(textView, false,
mClippingParams);
}
}); });
} }
}); });