Merge "Add activity label to encryption interstitial" into nyc-dev

2016-05-26 23:46:06 +00:00
parent d5f7c20a26 46a194bf3b
commit 19c0046422
1 changed files with 1 additions and 0 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1732,6 +1732,7 @@
            android:windowSoftInputMode="stateVisible|adjustResize"/>

        <activity android:name=".SetupEncryptionInterstitial"
+            android:label="@string/encryption_interstitial_header"
            android:taskAffinity="com.android.wizard"
            android:theme="@style/SetupWizardDisableAppStartingTheme"/>