Merge "Fix issue where clock scale would be wrong" (47bfb774) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+30 −1

Original line number	Diff line number	Diff line
		package com.android.keyguard;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.animation.ValueAnimator;
		import android.app.WallpaperManager;
		@@ -31,6 +32,9 @@ import com.android.systemui.plugins.ClockPlugin;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.StatusBarState;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Arrays;
		import java.util.TimeZone;

		/**
		@@ -333,6 +337,19 @@ public class KeyguardClockSwitch extends RelativeLayout {
		return mStateListener;
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("KeyguardClockSwitch:");
		pw.println(" mClockPlugin: " + mClockPlugin);
		pw.println(" mClockView: " + mClockView);
		pw.println(" mSmallClockFrame: " + mSmallClockFrame);
		pw.println(" mBigClockContainer: " + mBigClockContainer);
		pw.println(" mKeyguardStatusArea: " + mKeyguardStatusArea);
		pw.println(" mDarkAmount: " + mDarkAmount);
		pw.println(" mShowingHeader: " + mShowingHeader);
		pw.println(" mSupportsDarkText: " + mSupportsDarkText);
		pw.println(" mColorPalette: " + Arrays.toString(mColorPalette));
		}

		/**
		* Special layout transition that scales the clock view as its bounds change, to make it look
		* like the text is shrinking.
		@@ -372,11 +389,23 @@ public class KeyguardClockSwitch extends RelativeLayout {
		boundsAnimator.addUpdateListener(animation -> {
		float scale = MathUtils.lerp(startScale, 1f /* stop */,
		animation.getAnimatedFraction());
		mClockView.setPivotX(mClockView.getWidth() / 2);
		mClockView.setPivotX(mClockView.getWidth() / 2f);
		mClockView.setPivotY(0);
		mClockView.setScaleX(scale);
		mClockView.setScaleY(scale);
		});
		boundsAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animator) {
		mClockView.setScaleX(1f);
		mClockView.setScaleY(1f);
		}

		@Override
		public void onAnimationCancel(Animator animator) {
		onAnimationEnd(animator);
		}
		});
		}

		return animator;

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,8 @@ import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;
		@@ -174,6 +176,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
		if (mContentChangeListener != null) {
		mContentChangeListener.run();
		}
		Trace.endSection();
		return;
		}

		@@ -375,6 +378,17 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
		Trace.endSection();
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("KeyguardSliceView:");
		pw.println(" mClickActions: " + mClickActions);
		pw.println(" mTitle: " + (mTitle == null ? "null" : mTitle.getVisibility() == VISIBLE));
		pw.println(" mRow: " + (mRow == null ? "null" : mRow.getVisibility() == VISIBLE));
		pw.println(" mTextColor: " + Integer.toHexString(mTextColor));
		pw.println(" mDarkAmount: " + mDarkAmount);
		pw.println(" mSlice: " + mSlice);
		pw.println(" mHasHeader: " + mHasHeader);
		}

		public static class Row extends LinearLayout {

		/**

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@ import com.android.internal.widget.LockPatternUtils;
		import com.android.systemui.Dependency;
		import com.android.systemui.statusbar.policy.ConfigurationController;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Locale;
		import java.util.TimeZone;

		@@ -289,6 +291,24 @@ public class KeyguardStatusView extends GridLayout implements
		return false;
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("KeyguardStatusView:");
		pw.println(" mOwnerInfo: " + (mOwnerInfo == null
		? "null" : mOwnerInfo.getVisibility() == VISIBLE));
		pw.println(" mPulsing: " + mPulsing);
		pw.println(" mDarkAmount: " + mDarkAmount);
		pw.println(" mTextColor: " + Integer.toHexString(mTextColor));
		if (mLogoutView != null) {
		pw.println(" logout visible: " + (mLogoutView.getVisibility() == VISIBLE));
		}
		if (mClockView != null) {
		mClockView.dump(fd, pw, args);
		}
		if (mKeyguardSlice != null) {
		mKeyguardSlice.dump(fd, pw, args);
		}
		}

		// DateFormat.getBestDateTimePattern is extremely expensive, and refresh is called often.
		// This is an optimization to ensure we only recompute the patterns when the inputs change.
		private static final class Patterns {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,9 +20,6 @@ import static com.android.systemui.SysUiServiceProvider.getComponent;
		import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters;
		import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;


		import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		@@ -2956,6 +2953,9 @@ public class NotificationPanelView extends PanelView implements
		if (mKeyguardStatusBar != null) {
		mKeyguardStatusBar.dump(fd, pw, args);
		}
		if (mKeyguardStatusView != null) {
		mKeyguardStatusView.dump(fd, pw, args);
		}
		}

		public boolean hasActiveClearableNotifications() {