Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9dc08e9 authored by Michael Kwan's avatar Michael Kwan Committed by android-build-merger
Browse files

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

am: e57e9e50

Change-Id: I304fb65ef724c2a08c0ad6ed9805fc5f8683d6cc
parents 3c365b41 e57e9e50

core/res/res/values-watch/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

core/res/res/values/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -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;