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

Fix some crash cases when we launch AlertDialog

Browse Source 
AlertDialog needs to use App.Compat theme.

Change-Id: Icef2f5b5cf2d614f98fd1d793e88c6a7349b1380
Fixes: 111888332
Test: robo
This commit is contained in:
tmfang
2018-07-30 13:49:43 +08:00
parent 64771b5382
commit 5ade2f1976
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@@ -1917,7 +1917,7 @@
<activity android:name=".bluetooth.BluetoothPairingDialog" <activity android:name=".bluetooth.BluetoothPairingDialog"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:windowSoftInputMode="stateVisible|adjustResize" android:windowSoftInputMode="stateVisible|adjustResize"
android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"> android:theme="@style/Theme.AlertDialog">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -1964,7 +1964,7 @@
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:permission="android.permission.DUMP" android:permission="android.permission.DUMP"
android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"> android:theme="@style/Theme.AlertDialog">
<intent-filter> <intent-filter>
<action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" /> <action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -2660,7 +2660,7 @@
</activity> </activity>
<activity android:name=".sim.SimPreferenceDialog" <activity android:name=".sim.SimPreferenceDialog"
android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar" android:theme="@style/Theme.AlertDialog"
android:excludeFromRecents="true" /> android:excludeFromRecents="true" />
<activity <activity
@@ -2690,7 +2690,7 @@
</activity> </activity>
<activity android:name=".sim.SimDialogActivity" <activity android:name=".sim.SimDialogActivity"
android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar" android:theme="@style/Theme.AlertDialog"
android:label="@string/sim_settings_title" android:label="@string/sim_settings_title"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>