am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev (94c85309) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -1109,6 +1109,9 @@
		</intent-filter>
		</activity>

		<activity android:name=".SetupRedactionInterstitial"
		android:theme="@style/SetupWizardDisableAppStartingTheme"/>

		<activity android:name=".notification.RedactionInterstitial"/>

		<activity android:name=".notification.RedactionSettingsStandalone"
		@@ -1173,6 +1176,9 @@
		<activity android:name="ChooseLockPassword" android:exported="false"
		android:windowSoftInputMode="stateVisible\|adjustResize"/>

		<activity android:name=".SetupEncryptionInterstitial"
		android:theme="@style/SetupWizardDisableAppStartingTheme"/>

		<activity android:name=".EncryptionInterstitial"/>

		<!-- Runs in the phone process since it needs access to the Phone object -->

res/layout/encryption_interstitial.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingStart="@dimen/settings_side_margin"
		android:paddingEnd="@dimen/settings_side_margin">
		android:paddingStart="?attr/side_margin"
		android:paddingEnd="?attr/side_margin">

		<TextView
		android:id="@+id/encryption_message"

res/layout/redaction_interstitial.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingStart="@dimen/settings_side_margin"
		android:paddingEnd="@dimen/settings_side_margin">
		android:paddingStart="?attr/side_margin"
		android:paddingEnd="?attr/side_margin">

		<TextView
		android:layout_width="wrap_content"

res/values/themes.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		<attr name="ic_menu_moreoverflow" format="reference" />
		<attr name="ic_wps" format="reference" />
		<attr name="setup_divider_color" format="reference" />
		<attr name="side_margin" format="reference\|dimension" />
		<attr name="wifi_signal_color" format="reference" />
		<attr name="wifi_signal" format="reference" />

		@@ -40,6 +41,7 @@
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
		<item name="ic_wps">@drawable/ic_wps_dark</item>
		<item name="setup_divider_color">@color/setup_divider_color_dark</item>
		<item name="side_margin">0dip</item>
		<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
		<item name="wifi_signal">@drawable/wifi_signal_teal</item>
		<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
		@@ -57,6 +59,7 @@
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
		<item name="ic_wps">@drawable/ic_wps_light</item>
		<item name="setup_divider_color">@color/setup_divider_color_light</item>
		<item name="side_margin">0dip</item>
		<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
		<item name="wifi_signal">@drawable/wifi_signal_teal</item>
		<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
		@@ -98,6 +101,7 @@
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
		<item name="ic_wps">@drawable/ic_wps_dark</item>
		<item name="wifi_signal">@drawable/wifi_signal_teal</item>
		<item name="side_margin">@dimen/settings_side_margin</item>

		<!-- Redefine the ActionBar style for contentInsetStart -->
		<item name="android:actionBarStyle">@style/Theme.ActionBar</item>

src/com/android/settings/ChooseLockGeneric.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -180,13 +180,13 @@ public class ChooseLockGeneric extends SettingsActivity {
		if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()) {
		mEncryptionRequestQuality = quality;
		mEncryptionRequestDisabled = disabled;
		final Context context = getActivity();
		// If accessibility is enabled and the user hasn't seen this dialog before, set the
		// default state to agree with that which is compatible with accessibility
		// (password not required).
		final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
		final boolean accEn = AccessibilityManager.getInstance(context).isEnabled();
		final boolean required = mLockPatternUtils.isCredentialRequiredToDecrypt(!accEn);
		Intent intent = EncryptionInterstitial.createStartIntent(
		getActivity(), quality, required);
		Intent intent = getEncryptionInterstitialIntent(context, quality, required);
		startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST);
		} else {
		mRequirePassword = false; // device encryption not enabled or not device owner.
		@@ -405,6 +405,11 @@ public class ChooseLockGeneric extends SettingsActivity {
		confirmCredentials);
		}

		protected Intent getEncryptionInterstitialIntent(Context context, int quality,
		boolean required) {
		return EncryptionInterstitial.createStartIntent(context, quality, required);
		}

		/**
		* Invokes an activity to change the user's pattern, password or PIN based on given quality
		* and minimum quality specified by DevicePolicyManager. If quality is