Merge "Disable Keyguard affordances before setup is completed" into mnc-dev (0063e0bc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public class KeyguardAffordanceView extends ImageView {
		private float mCircleStartValue;
		private boolean mCircleWillBeHidden;
		private int[] mTempPoint = new int[2];
		private float mImageScale;
		private float mImageScale = 1f;
		private int mCircleColor;
		private boolean mIsLeft;
		private View mPreviewView;

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

+11 −11

Original line number	Diff line number	Diff line
		@@ -86,9 +86,9 @@ public class KeyguardAffordanceHelper {
		mContext = context;
		mCallback = callback;
		initIcons();
		updateIcon(mLeftIcon, 0.0f, mLeftIcon.getRestingAlpha(), false, false);
		updateIcon(mCenterIcon, 0.0f, mCenterIcon.getRestingAlpha(), false, false);
		updateIcon(mRightIcon, 0.0f, mRightIcon.getRestingAlpha(), false, false);
		updateIcon(mLeftIcon, 0.0f, mLeftIcon.getRestingAlpha(), false, false, true);
		updateIcon(mCenterIcon, 0.0f, mCenterIcon.getRestingAlpha(), false, false, true);
		updateIcon(mRightIcon, 0.0f, mRightIcon.getRestingAlpha(), false, false, true);
		initDimens();
		}

		@@ -387,15 +387,15 @@ public class KeyguardAffordanceHelper {
		boolean slowAnimation = isReset && isBelowFalsingThreshold();
		if (!isReset) {
		updateIcon(targetView, radius, alpha + fadeOutAlpha * targetView.getRestingAlpha(),
		false, false);
		false, false, false);
		} else {
		updateIcon(targetView, 0.0f, fadeOutAlpha * targetView.getRestingAlpha(),
		animateIcons, slowAnimation);
		animateIcons, slowAnimation, false);
		}
		updateIcon(otherView, 0.0f, fadeOutAlpha * otherView.getRestingAlpha(),
		animateIcons, slowAnimation);
		animateIcons, slowAnimation, false);
		updateIcon(mCenterIcon, 0.0f, fadeOutAlpha * mCenterIcon.getRestingAlpha(),
		animateIcons, slowAnimation);
		animateIcons, slowAnimation, false);

		mTranslation = translation;
		}
		@@ -431,13 +431,13 @@ public class KeyguardAffordanceHelper {

		public void animateHideLeftRightIcon() {
		cancelAnimation();
		updateIcon(mRightIcon, 0f, 0f, true, false);
		updateIcon(mLeftIcon, 0f, 0f, true, false);
		updateIcon(mRightIcon, 0f, 0f, true, false, false);
		updateIcon(mLeftIcon, 0f, 0f, true, false, false);
		}

		private void updateIcon(KeyguardAffordanceView view, float circleRadius, float alpha,
		boolean animate, boolean slowRadiusAnimation) {
		if (view.getVisibility() != View.VISIBLE) {
		boolean animate, boolean slowRadiusAnimation, boolean force) {
		if (view.getVisibility() != View.VISIBLE && !force) {
		return;
		}
		view.setCircleRadius(circleRadius, slowRadiusAnimation);

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		private PhoneStatusBar mPhoneStatusBar;

		private final Interpolator mLinearOutSlowInInterpolator;
		private boolean mUserSetupComplete;
		private boolean mPrewarmBound;
		private Messenger mPrewarmMessenger;
		private final ServiceConnection mPrewarmConnection = new ServiceConnection() {
		@@ -250,6 +251,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		updateCameraVisibility(); // in case onFinishInflate() was called too early
		}

		public void setUserSetupComplete(boolean userSetupComplete) {
		mUserSetupComplete = userSetupComplete;
		updateCameraVisibility();
		updateLeftAffordanceIcon();
		}

		private Intent getCameraIntent() {
		KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
		boolean canSkipBouncer = updateMonitor.getUserCanSkipBouncer(
		@@ -267,7 +274,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		PackageManager.MATCH_DEFAULT_ONLY,
		KeyguardUpdateMonitor.getCurrentUser());
		boolean visible = !isCameraDisabledByDpm() && resolved != null
		&& getResources().getBoolean(R.bool.config_keyguardShowCameraAffordance);
		&& getResources().getBoolean(R.bool.config_keyguardShowCameraAffordance)
		&& mUserSetupComplete;
		mCameraImageView.setVisibility(visible ? View.VISIBLE : View.GONE);
		}

		@@ -275,16 +283,16 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		mLeftIsVoiceAssist = canLaunchVoiceAssist();
		int drawableId;
		int contentDescription;
		boolean visible = mUserSetupComplete;
		if (mLeftIsVoiceAssist) {
		mLeftAffordanceView.setVisibility(View.VISIBLE);
		drawableId = R.drawable.ic_mic_26dp;
		contentDescription = R.string.accessibility_voice_assist_button;
		} else {
		boolean visible = isPhoneVisible();
		mLeftAffordanceView.setVisibility(visible ? View.VISIBLE : View.GONE);
		visible &= isPhoneVisible();
		drawableId = R.drawable.ic_phone_24dp;
		contentDescription = R.string.accessibility_phone_button;
		}
		mLeftAffordanceView.setVisibility(visible ? View.VISIBLE : View.GONE);
		mLeftAffordanceView.setImageDrawable(mContext.getDrawable(drawableId));
		mLeftAffordanceView.setContentDescription(mContext.getString(contentDescription));
		}

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -366,6 +366,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mUserSetup = userSetup;
		if (!mUserSetup && mStatusBarView != null)
		animateCollapseQuickSettings();
		if (mKeyguardBottomArea != null) {
		mKeyguardBottomArea.setUserSetupComplete(mUserSetup);
		}
		}
		if (mIconPolicy != null) {
		mIconPolicy.setCurrentUserSetup(mUserSetup);
		@@ -842,6 +845,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mFlashlightController = new FlashlightController(mContext);
		mKeyguardBottomArea.setFlashlightController(mFlashlightController);
		mKeyguardBottomArea.setPhoneStatusBar(this);
		mKeyguardBottomArea.setUserSetupComplete(mUserSetup);
		mAccessibilityController = new AccessibilityController(mContext);
		mKeyguardBottomArea.setAccessibilityController(mAccessibilityController);
		mNextAlarmController = new NextAlarmController(mContext);