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

Merge "Fix crash in settings"

Browse Source
This commit is contained in:
Jorim Jaggi
2015-04-14 18:36:10 +00:00
committed by Android (Google) Code Review
parent 2533651570 02d548790b
commit bc90ee8736
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -1356,12 +1356,14 @@
<!-- Note this must not be exported since it returns the password in the intent --> <!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name="ConfirmLockPattern$InternalActivity" <activity android:name="ConfirmLockPattern$InternalActivity"
android:exported="false"/> android:exported="false"
android:theme="@style/Theme.ConfirmDeviceCredentials"/>
<!-- Note this must not be exported since it returns the password in the intent --> <!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name="ConfirmLockPassword$InternalActivity" <activity android:name="ConfirmLockPassword$InternalActivity"
android:exported="false" android:exported="false"
android:windowSoftInputMode="stateVisible|adjustResize"/> android:windowSoftInputMode="stateVisible|adjustResize"
android:theme="@style/Theme.ConfirmDeviceCredentials"/>
<activity android:name="SetupChooseLockGeneric" <activity android:name="SetupChooseLockGeneric"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"