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

Merge "Added customizable default system theme." into nyc-mr1-dev

Browse Source
This commit is contained in:
Michael Kwan
2016-06-14 19:26:57 +00:00
committed by Android (Google) Code Review
parent 85cd35b1dc 9c7274c796
commit e57e9e5096
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-watch/themes_device_defaults.xml
View File

@@ -38,4 +38,6 @@ easier.
<item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
</style>
<!-- Use a dark theme for watches. -->
<style name="Theme.DeviceDefault.System" parent="Theme.Material" />
</resources>

1
core/res/res/values/symbols.xml
View File

@@ -2188,6 +2188,7 @@
<java-symbol type="style" name="TextAppearance.Material.TimePicker.TimeLabel" />
<java-symbol type="attr" name="seekBarPreferenceStyle" />
<java-symbol type="style" name="Theme.DeviceDefault.Resolver" />
<java-symbol type="style" name="Theme.DeviceDefault.System" />
<java-symbol type="attr" name="preferenceActivityStyle" />
<java-symbol type="attr" name="preferenceFragmentStyle" />
<java-symbol type="bool" name="skipHoldBeforeMerge" />

2
core/res/res/values/themes_device_defaults.xml
View File

@@ -551,4 +551,6 @@ easier.
<item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
</style>
<!-- DeviceDefault theme for the default system theme. -->
<style name="Theme.DeviceDefault.System" parent="Theme.Material.Light.DarkActionBar" />
</resources>

2
services/java/com/android/server/SystemServer.java
View File

@@ -181,7 +181,7 @@ public final class SystemServer {
* visual content.
*/
private static final int DEFAULT_SYSTEM_THEME =
com.android.internal.R.style.Theme_DeviceDefault_Light_DarkActionBar;
com.android.internal.R.style.Theme_DeviceDefault_System;
private final int mFactoryTestMode;
private Timer mProfilerSnapshotTimer;