Merge changes from topic "ss_next_alarm" into sc-dev am: 241f1e71c2 (55deece9) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.app.PendingIntent;
		import android.app.smartspace.SmartspaceAction;
		import android.app.smartspace.SmartspaceTarget;
		import android.content.Intent;
		import android.graphics.drawable.Icon;
		import android.graphics.drawable.Drawable;
		import android.os.Parcelable;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -93,9 +93,14 @@ public interface BcSmartspaceDataPlugin extends Plugin {
		void setFalsingManager(com.android.systemui.plugins.FalsingManager falsingManager);

		/**
		* Set or clear any Do Not Disturb information.
		* Set or clear Do Not Disturb information.
		*/
		void setDnd(@Nullable Icon dndIcon, @Nullable String description);
		void setDnd(@Nullable Drawable image, @Nullable String description);

		/**
		* Set or clear next alarm information
		*/
		void setNextAlarm(@Nullable Drawable image, @Nullable String description);
		}

		/** Interface for launching Intents, which can differ on the lockscreen */

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

+4 −13

Original line number	Diff line number	Diff line
		@@ -16,23 +16,14 @@
		* limitations under the License.
		*/
		-->
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@+id/background">
		<shape>
		<solid android:color="?android:attr/colorControlNormal" />
		<corners android:radius="10dp" />
		</shape>
		</item>
		<item android:id="@+id/ripple">
		<ripple
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item android:id="@android:id/mask">
		<shape android:shape="rectangle">
		<item android:id="@+id/background">
		<shape>
		<solid android:color="?android:attr/colorControlNormal" />
		<corners android:radius="10dp" />
		</shape>
		</item>
		</ripple>
		</item>
		</layer-list>

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

+4 −9

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ 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;

		@@ -167,7 +166,6 @@ 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,
		@@ -177,8 +175,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		InputMethodManager inputMethodManager, @Main DelayableExecutor mainExecutor,
		@Main Resources resources, LiftToActivateListener liftToActivateListener,
		TelephonyManager telephonyManager, FalsingCollector falsingCollector,
		EmergencyButtonController.Factory emergencyButtonControllerFactory,
		FeatureFlags featureFlags) {
		EmergencyButtonController.Factory emergencyButtonControllerFactory) {
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mLockPatternUtils = lockPatternUtils;
		mLatencyTracker = latencyTracker;
		@@ -190,7 +187,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		mTelephonyManager = telephonyManager;
		mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;
		mFalsingCollector = falsingCollector;
		mIsNewLayoutEnabled = featureFlags.isKeyguardLayoutEnabled();
		}

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

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

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -168,20 +168,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
		return mButtons;
		}

		/**
		* 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

+1 −2

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

		@Override