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

Merge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev

Browse Source 
am: 85902750a5

Change-Id: I975563cc36cd9d4011db01c227ef5f32d80e7fd7
This commit is contained in:
Andrew Sapperstein
2016-07-19 21:52:38 +00:00
committed by android-build-merger
parent 36446521fd 85902750a5
commit 25e2e0338f
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
AndroidManifest.xml
View File

@@ -209,7 +209,7 @@
<activity android:name="AirplaneModeVoiceActivity"
android:label="@string/wireless_networks_settings_title"
android:theme="@android:style/Theme.Material.Light.Voice"
android:theme="@*android:style/Theme.DeviceDefault.Light.Voice"
android:exported="true">
<intent-filter>
<action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
@@ -379,7 +379,7 @@
android:exported="true"
android:permission="android.permission.CONNECTIVITY_INTERNAL"
android:taskAffinity=""
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.net.conn.PROMPT_UNVALIDATED" />
<category android:name="android.intent.category.DEFAULT" />
@@ -560,7 +560,7 @@
<activity android:name="DateTimeSettingsSetupWizard"
android:label="@string/date_and_time"
android:theme="@android:style/Theme.Material.Light.NoActionBar"
android:theme="@android:style/Theme.DeviceDefault.Light.NoActionBar"
android:screenOrientation="behind">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -729,7 +729,7 @@
<activity android:name=".inputmethod.UserDictionaryAddWordActivity"
android:label="@string/user_dict_settings_title"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
android:windowSoftInputMode="stateVisible"
android:noHistory="true"
android:excludeFromRecents="true">
@@ -988,7 +988,7 @@
<activity android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"
android:theme="@android:style/Theme.Material.Light.Panel"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:configChanges="orientation|screenSize">
<intent-filter android:priority="1">
<action android:name="android.settings.LICENSE" />
@@ -1093,7 +1093,7 @@
<activity android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
android:label="@string/high_power_apps"
android:taskAffinity=""
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1">
<action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1211,7 +1211,7 @@
</activity>
<activity android:name=".notification.ZenModeVoiceActivity"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
android:label="@string/zen_mode_settings_title">
<intent-filter>
<action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />
@@ -1975,7 +1975,7 @@
</activity-alias>
<activity android:name=".AppPicker" android:label="@string/select_application"
android:theme="@android:style/Theme.Material.Light.Dialog" />
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UsbSettings"
@@ -2025,7 +2025,7 @@
android:label="@string/bluetooth_permission_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1">
<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
<action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -2046,14 +2046,14 @@
android:excludeFromRecents="true"
android:exported="true"
android:permission="android.permission.MANAGE_USB"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
</activity>
<activity android:name=".RemoteBugreportActivity"
android:excludeFromRecents="true"
android:exported="true"
android:permission="android.permission.DUMP"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
<intent-filter>
<action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2064,7 +2064,7 @@
android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
</activity>
<receiver android:name=".bluetooth.BluetoothPairingRequest">
@@ -2087,7 +2087,7 @@
android:label="@string/bluetooth_connection_permission_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH_ADMIN"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1">
<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
@@ -2097,7 +2097,7 @@
<activity android:name="ActivityPicker"
android:label="@string/activity_picker_label"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true">
<intent-filter android:priority="1">
<action android:name="android.intent.action.PICK_ACTIVITY" />
@@ -2160,7 +2160,7 @@
<!-- TODO: Is this needed? -->
<activity android:name="BandMode"
android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2188,7 +2188,7 @@
<!-- Standard picker for widgets -->
<activity android:name="AppWidgetPickActivity"
android:label="@string/widget_picker_title"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true">
<intent-filter android:priority="1">
<action android:name="android.appwidget.action.APPWIDGET_PICK" />
@@ -2197,7 +2197,7 @@
</activity>
<activity android:name="AllowBindAppWidgetActivity"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true">
<intent-filter android:priority="1">
@@ -2267,7 +2267,7 @@
<activity android:name=".fuelgauge.BatterySaverModeVoiceActivity"
android:label="@string/power_usage_summary_title"
android:theme="@android:style/Theme.Material.Light.Voice"
android:theme="@*android:style/Theme.DeviceDefault.Light.Voice"
android:exported="true">
<intent-filter>
<action android:name="android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE" />
@@ -2486,7 +2486,7 @@
<activity android:name=".nfc.PaymentDefaultDialog"
android:label="@string/nfc_payment_set_default_label"
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1">
<action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2504,7 +2504,7 @@
<activity android:name=".SmsDefaultDialog"
android:label="@string/sms_application_title"
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1">
<action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2514,7 +2514,7 @@
<activity android:name=".ActiveNetworkScorerDialog"
android:label="@string/wifi_assistant_title"
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1">
<action android:name="android.net.scoring.CHANGE_ACTIVE" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2767,7 +2767,7 @@
</activity>
<activity android:name=".sim.SimPreferenceDialog"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
android:excludeFromRecents="true">
</activity>
@@ -2785,7 +2785,7 @@
</activity>
<activity android:name=".sim.SimDialogActivity"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
android:label="@string/sim_settings_title"
android:excludeFromRecents="true">
<intent-filter>
@@ -2911,7 +2911,7 @@
<activity android:name=".WebViewImplementation"
android:exported="true"
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.settings.WEBVIEW_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />