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

Commit b0d25d2e authored by Winson Chung's avatar Winson Chung
Browse files

Fix some issues with studio build 

- Move private color attrs to their own resources
- Remove duplicate resource already defined in keyguard-res
  (already used elsewhere in sysui)

Bug: 152086714
Test: Studio builds
Change-Id: I4b96bedabcbe9d9c2d2f8ef394781616b83807ec
parent d1436f18

packages/SystemUI/res/color/settingslib_state_off.xml

0 → 100644
+5 −0
Original line number Original line 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 Original line 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 Original line 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 Original line 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 Original line Diff line number Diff line
@@ -286,13 +286,13 @@ 




    <!-- Internet Dialog -->

    <!-- Internet Dialog -->

    <!-- 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">@color/settingslib_state_on</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">@color/settingslib_state_off</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">@color/settingslib_track_on</color>

    <!-- Material next track off 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_primary_color">#191C18</color>

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

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

</resources>
 
</resources>