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

Commit 777db522 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix some issues with studio build" into sc-v2-dev am: 95ae7391 

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

Change-Id: I8a3b1fc69480023cb4f421d0526256f3702ee4ef
parents e7bbb2e8 95ae7391

packages/SystemUI/res/color/settingslib_state_off.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android"

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

 <item android:color="?androidprv:attr/colorAccentSecondaryVariant"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/settingslib_state_on.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android"

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

 <item android:color="?androidprv:attr/colorAccentPrimary"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/settingslib_track_off.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android"

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

 <item android:color="?androidprv:attr/colorAccentSecondary"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/settingslib_track_on.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android"

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

 <item android:color="?androidprv:attr/colorAccentPrimaryVariant"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

+4 −4
Original line number Diff line number Diff line
@@ -286,13 +286,13 @@ 


    <!-- Internet Dialog -->

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

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

    <color name="settingslib_state_on_color">@color/settingslib_state_on</color>

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

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

    <color name="settingslib_state_off_color">@color/settingslib_state_off</color>

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

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

    <color name="settingslib_track_on_color">@color/settingslib_track_on</color>

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

    <color name="settingslib_track_off_color">?androidprv:attr/colorAccentSecondaryVariant</color>

    <color name="settingslib_track_off_color">@color/settingslib_track_off</color>

    <color name="connected_network_primary_color">#191C18</color>

    <color name="connected_network_secondary_color">#41493D</color>

</resources>