Merge "PIN View - Control layout based on feature flag" into sc-dev (66d8f10f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/drawable/ripple_drawable_pin.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2018 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:attr/colorControlHighlight"
		android:radius="40dp"/>

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
		import com.android.systemui.R;
		import com.android.systemui.classifier.FalsingCollector;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.util.ViewController;
		import com.android.systemui.util.concurrency.DelayableExecutor;

		@@ -166,6 +167,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		private final TelephonyManager mTelephonyManager;
		private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;
		private final FalsingCollector mFalsingCollector;
		private final boolean mIsNewLayoutEnabled;

		@Inject
		public Factory(KeyguardUpdateMonitor keyguardUpdateMonitor,
		@@ -176,7 +178,8 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		@Main Resources resources, LiftToActivateListener liftToActivateListener,
		TelephonyManager telephonyManager,
		EmergencyButtonController.Factory emergencyButtonControllerFactory,
		FalsingCollector falsingCollector) {
		FalsingCollector falsingCollector,
		FeatureFlags featureFlags) {
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mLockPatternUtils = lockPatternUtils;
		mLatencyTracker = latencyTracker;
		@@ -188,6 +191,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		mTelephonyManager = telephonyManager;
		mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;
		mFalsingCollector = falsingCollector;
		mIsNewLayoutEnabled = featureFlags.isKeyguardLayoutEnabled();
		}

		/** Create a new {@link KeyguardInputViewController}. */
		@@ -212,21 +216,22 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		return new KeyguardPinViewController((KeyguardPINView) keyguardInputView,
		mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,
		keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,
		mLiftToActivateListener, emergencyButtonController, mFalsingCollector);
		mLiftToActivateListener, emergencyButtonController, mFalsingCollector,
		mIsNewLayoutEnabled);
		} else if (keyguardInputView instanceof KeyguardSimPinView) {
		return new KeyguardSimPinViewController((KeyguardSimPinView) keyguardInputView,
		mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,
		keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,
		mLiftToActivateListener, mTelephonyManager,
		emergencyButtonController,
		mFalsingCollector);
		mFalsingCollector, mIsNewLayoutEnabled);
		} else if (keyguardInputView instanceof KeyguardSimPukView) {
		return new KeyguardSimPukViewController((KeyguardSimPukView) keyguardInputView,
		mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,
		keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,
		mLiftToActivateListener, mTelephonyManager,
		emergencyButtonController,
		mFalsingCollector);
		mFalsingCollector, mIsNewLayoutEnabled);
		}

		throw new RuntimeException("Unable to find controller for " + keyguardInputView);

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,20 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
		reloadColors();
		}

		/**
		* By default, the new layout will be enabled. When false, revert to the old style.
		*/
		public void setIsNewLayoutEnabled(boolean isEnabled) {
		if (!isEnabled) {
		for (int i = 0; i < mButtons.length; i++) {
		mButtons[i].disableNewLayout();
		}
		mDeleteButton.disableNewLayout();
		mOkButton.disableNewLayout();
		reloadColors();
		}
		}

		/**
		* Reload colors from resources.
		**/

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -35,11 +35,12 @@ public class KeyguardPinViewController
		KeyguardMessageAreaController.Factory messageAreaControllerFactory,
		LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,
		EmergencyButtonController emergencyButtonController,
		FalsingCollector falsingCollector) {
		FalsingCollector falsingCollector, boolean isNewLayoutEnabled) {
		super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,
		messageAreaControllerFactory, latencyTracker, liftToActivateListener,
		emergencyButtonController, falsingCollector);
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		view.setIsNewLayoutEnabled(isNewLayoutEnabled);
		}

		@Override

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -79,13 +79,14 @@ public class KeyguardSimPinViewController
		KeyguardMessageAreaController.Factory messageAreaControllerFactory,
		LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener,
		TelephonyManager telephonyManager, EmergencyButtonController emergencyButtonController,
		FalsingCollector falsingCollector) {
		FalsingCollector falsingCollector, boolean isNewLayoutEnabled) {
		super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,
		messageAreaControllerFactory, latencyTracker, liftToActivateListener,
		emergencyButtonController, falsingCollector);
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mTelephonyManager = telephonyManager;
		mSimImageView = mView.findViewById(R.id.keyguard_sim);
		view.setIsNewLayoutEnabled(isNewLayoutEnabled);
		}

		@Override