Merge "LockScreen: Add option to start widgets maximized" into cm-10.1 (4b1a55a7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -3017,6 +3017,12 @@ public final class Settings {
		*/
		public static final String KEY_ASSIST_ACTION = "key_assist_action";

		/**
		* Weather to minimize lockscreen challenge on screen turned on
		* @hide
		*/
		public static final String LOCKSCREEN_MAXIMIZE_WIDGETS = "lockscreen_maximize_widgets";

		/**
		* Action to perform when the assistant (search) key is long-pressed. (Default is 4)
		* (See KEY_HOME_LONG_PRESS_ACTION for valid values)

+15 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,7 @@ public class KeyguardHostView extends KeyguardViewBase {

		showPrimarySecurityScreen(false);
		updateSecurityViews();
		minimizeChallengeIfDesired();
		}

		private int getDisabledFeatures(DevicePolicyManager dpm) {
		@@ -830,6 +831,7 @@ public class KeyguardHostView extends KeyguardViewBase {
		if (mViewStateManager != null) {
		mViewStateManager.showUsabilityHints();
		}
		minimizeChallengeIfDesired();
		}

		@Override
		@@ -917,6 +919,19 @@ public class KeyguardHostView extends KeyguardViewBase {
		}
		}

		private void minimizeChallengeIfDesired() {
		if (mSlidingChallengeLayout == null) {
		return;
		}

		int setting = Settings.System.getIntForUser(getContext().getContentResolver(),
		Settings.System.LOCKSCREEN_MAXIMIZE_WIDGETS, 0, UserHandle.USER_CURRENT);

		if (setting == 1) {
		mSlidingChallengeLayout.showChallenge(false);
		}
		}

		private int getSecurityViewIdForMode(SecurityMode securityMode) {
		switch (securityMode) {
		case None: return R.id.keyguard_selector_view;