commit ecd2b7b81fd2faa2f2f3dbe5a169c749321f3d89
author Maurice Lam <yukl@google.com> Mon Dec 01 10:41:49 2014 -0800
committer Maurice Lam <yukl@google.com> Mon Dec 01 20:24:08 2014 -0800
tree 77aea30201a9c0f27ece33108c8625dc96f80a2f
parent 6b19fa9017800b94c75238339a337fd8f6c3e808

[FRP] Theme interstitials for lock screen setup

Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.

Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 82b135f..4360443 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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 -->