PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422 am: 2ddf85b94b

Browse Source 
am: 934bb00ac3

* commit '934bb00ac317001db159bc28e12e4c43905a88c9':
  Add activity label to encryption interstitial

Change-Id: I7e2eaabb379bf878f88b12cee4c4909b5100499e
This commit is contained in:
Maurice Lam
2016-05-27 00:32:35 +00:00
committed by android-build-merger
parent 8d212eb8ba 934bb00ac3
commit 225d64cc5d
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1729,6 +1729,7 @@
android:windowSoftInputMode="stateVisible|adjustResize"/> android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name=".SetupEncryptionInterstitial" <activity android:name=".SetupEncryptionInterstitial"
android:label="@string/encryption_interstitial_header"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/> android:theme="@style/SetupWizardDisableAppStartingTheme"/>