Snap for 8237733 from 1774ba8a9731cfa9d943251b83c25d3d84913d49 to sc-qpr3-release (1ccf6072) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9663,6 +9663,13 @@ public final class Settings {
	public static final String LOCKSCREEN_USE_DOUBLE_LINE_CLOCK =		public static final String LOCKSCREEN_USE_DOUBLE_LINE_CLOCK =
	"lockscreen_use_double_line_clock";		"lockscreen_use_double_line_clock";

			/**
			* Whether to show the vibrate icon in the Status Bar (default off)
			*
			* @hide
			*/
			public static final String STATUS_BAR_SHOW_VIBRATE_ICON = "status_bar_show_vibrate_icon";

	/**		/**
	* Specifies whether the web action API is enabled.		* Specifies whether the web action API is enabled.
	*		*

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -192,5 +192,6 @@ public class SecureSettings {
	Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,		Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,
	Settings.Secure.LOCKSCREEN_SHOW_WALLET,		Settings.Secure.LOCKSCREEN_SHOW_WALLET,
	Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,		Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,
			Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON
	};		};
	}		}

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -151,6 +151,7 @@ public class SecureSettingsValidators {
	VALIDATORS.put(Secure.LOCKSCREEN_SHOW_CONTROLS, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.LOCKSCREEN_SHOW_CONTROLS, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.LOCKSCREEN_SHOW_WALLET, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.LOCKSCREEN_SHOW_WALLET, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, BOOLEAN_VALIDATOR);
			VALIDATORS.put(Secure.STATUS_BAR_SHOW_VIBRATE_ICON, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.DOZE_ENABLED, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.DOZE_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.DOZE_ALWAYS_ON, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.DOZE_ALWAYS_ON, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.DOZE_PICK_UP_GESTURE, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.DOZE_PICK_UP_GESTURE, BOOLEAN_VALIDATOR);

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2937,8 +2937,9 @@ public class StatusBar extends SystemUI implements
	// turned off fully.		// turned off fully.
	boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()		boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()
	&& (!mDeviceInteractive \|\| isGoingToSleep() && (isScreenFullyOff() \|\| mIsKeyguard));		&& (!mDeviceInteractive \|\| isGoingToSleep() && (isScreenFullyOff() \|\| mIsKeyguard));
			boolean isWakingAndOccluded = isOccluded() && isWaking();
	boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()		boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()
	\|\| keyguardForDozing) && !wakeAndUnlocking;		\|\| keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded;
	if (keyguardForDozing) {		if (keyguardForDozing) {
	updatePanelExpansionForKeyguard();		updatePanelExpansionForKeyguard();
	}		}
	@@ -3716,6 +3717,10 @@ public class StatusBar extends SystemUI implements
	== WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;		== WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;
	}		}

			boolean isWaking() {
			return mWakefulnessLifecycle.getWakefulness() == WakefulnessLifecycle.WAKEFULNESS_WAKING;
			}

	public void notifyBiometricAuthModeChanged() {		public void notifyBiometricAuthModeChanged() {
	mDozeServiceHost.updateDozing();		mDozeServiceHost.updateDozing();
	updateScrimController();		updateScrimController();

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

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ import com.android.systemui.statusbar.StatusIconDisplayable;
	import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.CallIndicatorIconState;		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.CallIndicatorIconState;
	import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState;		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState;
	import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;
			import com.android.systemui.util.Assert;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;
	@@ -65,6 +66,8 @@ public interface StatusBarIconController {
	void addIconGroup(IconManager iconManager);		void addIconGroup(IconManager iconManager);
	/** */		/** */
	void removeIconGroup(IconManager iconManager);		void removeIconGroup(IconManager iconManager);
			/** Refresh the state of an IconManager by recreating the views */
			void refreshIconGroup(IconManager iconManager);
	/** */		/** */
	void setExternalIcon(String slot);		void setExternalIcon(String slot);
	/** */		/** */
	@@ -242,6 +245,7 @@ public interface StatusBarIconController {
	protected final int mIconSize;		protected final int mIconSize;
	// Whether or not these icons show up in dumpsys		// Whether or not these icons show up in dumpsys
	protected boolean mShouldLog = false;		protected boolean mShouldLog = false;
			private StatusBarIconController mController;

	// Enables SystemUI demo mode to take effect in this group		// Enables SystemUI demo mode to take effect in this group
	protected boolean mDemoable = true;		protected boolean mDemoable = true;
	@@ -266,13 +270,17 @@ public interface StatusBarIconController {
	mDemoable = demoable;		mDemoable = demoable;
	}		}

	public void setBlockList(@Nullable List<String> blockList) {		void setController(StatusBarIconController controller) {
	mBlockList.clear();		mController = controller;
	if (blockList == null \|\| blockList.isEmpty()) {
	return;
	}		}

			public void setBlockList(@Nullable List<String> blockList) {
			Assert.isMainThread();
			mBlockList.clear();
	mBlockList.addAll(blockList);		mBlockList.addAll(blockList);
			if (mController != null) {
			mController.refreshIconGroup(this);
			}
	}		}

	public void setShouldLog(boolean should) {		public void setShouldLog(boolean should) {