diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | core/res/res/layout/harmful_app_warning_dialog.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values-television/themes.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/themes_leanback.xml | 3 |
5 files changed, 15 insertions, 8 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 5a1f2e8d870c..964fa00cf408 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4299,7 +4299,7 @@ </activity> <activity android:name="com.android.internal.app.NetInitiatedActivity" - android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true" android:process=":ui"> </activity> @@ -4320,7 +4320,7 @@ <activity android:name="com.android.internal.app.ConfirmUserCreationActivity" android:excludeFromRecents="true" android:process=":ui" - android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert"> + android:theme="@style/Theme.Dialog.Confirmation"> <intent-filter android:priority="1000"> <action android:name="android.os.action.CREATE_USER" /> <category android:name="android.intent.category.DEFAULT" /> @@ -4328,24 +4328,24 @@ </activity> <activity android:name="com.android.internal.app.SuspendedAppActivity" - android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true" android:process=":ui"> </activity> <activity android:name="com.android.internal.app.UnlaunchableAppActivity" - android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true" android:process=":ui"> </activity> <activity android:name="com.android.settings.notification.NotificationAccessConfirmationActivity" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true"> </activity> <activity android:name="com.android.internal.app.HarmfulAppWarningActivity" - android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true" android:process=":ui" android:label="@string/harmful_app_warning_title" diff --git a/core/res/res/layout/harmful_app_warning_dialog.xml b/core/res/res/layout/harmful_app_warning_dialog.xml index d41691f4bb1b..62ca7a6fde5b 100644 --- a/core/res/res/layout/harmful_app_warning_dialog.xml +++ b/core/res/res/layout/harmful_app_warning_dialog.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" - android:textColor="@color/primary_text_material_light" + android:textColor="?attr/textColorPrimary" android:textSize="@dimen/text_size_subhead_material" android:paddingLeft="@dimen/harmful_app_icon_name_padding"> </TextView> @@ -65,4 +65,4 @@ android:lineSpacingMultiplier="@dimen/harmful_app_message_line_spacing_modifier" android:textSize="@dimen/text_size_body_1_material"/> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/core/res/res/values-television/themes.xml b/core/res/res/values-television/themes.xml index 48b59c70a61e..176e89ebc691 100644 --- a/core/res/res/values-television/themes.xml +++ b/core/res/res/values-television/themes.xml @@ -15,6 +15,7 @@ --> <resources> <style name="Theme.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" /> + <style name="Theme.Dialog.Confirmation" parent="Theme.Leanback.Dialog.Confirmation" /> <style name="Theme.Holo.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" /> <style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" /> <style name="Theme.Material.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index a7530cea5d73..ad38f3d57c23 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -880,6 +880,9 @@ please see themes_device_defaults.xml. <item name="windowActivityTransitions">false</item> </style> + <!-- @hide Special theme for the default system Activity-based Alert dialogs. --> + <style name="Theme.Dialog.Confirmation" parent="Theme.DeviceDefault.Light.Dialog.Alert" /> + <!-- Theme for a window that looks like a toast. --> <style name="Theme.Toast" parent="Theme.DeviceDefault.Dialog"> <item name="windowBackground">?attr/toastFrameBackground</item> diff --git a/core/res/res/values/themes_leanback.xml b/core/res/res/values/themes_leanback.xml index f71df9fb4807..a80725c2758b 100644 --- a/core/res/res/values/themes_leanback.xml +++ b/core/res/res/values/themes_leanback.xml @@ -130,4 +130,7 @@ <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> </style> + <!-- @hide Special theme for the default system Activity-based Alert dialogs. --> + <style name="Theme.Leanback.Dialog.Confirmation" parent="Theme.DeviceDefault.Dialog.Alert" /> + </resources> |