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

Commit 12a8d8ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace private color attribute with corresponding color resource" into... 

Merge "Replace private color attribute with corresponding color resource" into sc-dev am: b62e7a14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14774651

Change-Id: I9292db7bcf575d41b268d29d063e0c69cd7baa2a
parents 30a54855 b62e7a14

packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml

+4 −4
Original line number Diff line number Diff line
@@ -15,18 +15,18 @@ 
  limitations under the License.

  -->



<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

<resources>

    <!-- Material next state on color-->

    <color name="settingslib_state_on_color">?androidprv:attr/colorAccentPrimary</color>

    <color name="settingslib_state_on_color">@android:color/system_accent1_100</color>



    <!-- Material next state off color-->

    <color name="settingslib_state_off_color">?androidprv:attr/colorAccentSecondary</color>

    <color name="settingslib_state_off_color">@android:color/system_accent2_100</color>



    <!-- Material next thumb off color-->

    <color name="settingslib_thumb_off_color">@android:color/system_neutral2_100</color>



    <!-- Material next track on color-->

    <color name="settingslib_track_on_color">?androidprv:attr/colorAccentPrimaryVariant</color>

    <color name="settingslib_track_on_color">@android:color/system_accent1_600</color>



    <!-- Material next track off color-->

    <color name="settingslib_track_off_color">@android:color/system_neutral2_600</color>