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

Commit af044c28 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 am: 12a8d8ca

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

Change-Id: I45b0d80423105c9636841657bb817dc24d9d7f0c
parents 92924917 12a8d8ca

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

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

  limitations under the License.

  -->

  -->





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

<resources>

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

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

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

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

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

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





    <!-- Material next track on 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-->

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

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

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