Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make system Dialog Activities theme friendly and support dark theme"

Browse Source
This commit is contained in:
Oleksandr Tolstykh
2018-10-24 07:51:19 +00:00
committed by Android (Google) Code Review
parent 35ab42f7a4 1e5720eac4
commit f7c3e3174d
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/res/AndroidManifest.xml
View File

@@ -4342,7 +4342,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>
@@ -4363,7 +4363,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" />
@@ -4371,24 +4371,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"

4
core/res/res/layout/harmful_app_warning_dialog.xml
View File

@@ -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>
</ScrollView>

1
core/res/res/values-television/themes.xml
View File

@@ -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" />

3
core/res/res/values/themes.xml
View File

@@ -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>

3
core/res/res/values/themes_leanback.xml
View File

@@ -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>