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

Commit feced101 authored by Ben Lin's avatar Ben Lin Committed by android-build-merger
Browse files

Move all internal resource dependencies to respetive values/, and made...

Move all internal resource dependencies to respetive values/, and made values-v24 directory for N devices.
am: c046d558

Change-Id: Icbfd645c1858cceb7601f671ef8311a565da30d5
parents e1e9abbd c046d558
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@color/root_icon_color" />
    <item android:state_enabled="false"
        android:alpha="@dimen/root_icon_disabled_alpha"
        android:color="@color/root_icon_color" />
    <item android:color="@color/root_icon_color" />
</selector>
+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@
        android:color="@color/item_doc_title" />
    <item
        android:state_enabled="false"
        android:color="@*android:color/secondary_text_default_material_light"/>
        android:color="@color/item_doc_title_disabled"/>
</selector>

res/color/root_activated.xml

deleted100644 → 0
+0 −5
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">
    <item android:state_activated="true" android:color="?android:attr/colorAccent" />
    <item android:color="@*android:color/secondary_text_material_light" />
</selector>
+23 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"
       android:tint="?android:attr/colorForeground">
    <solid android:color="#1f000000" />
    <size
        android:height="1dp"
        android:width="1dp" />
</shape>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@
    android:paddingStart="24dp"
    android:paddingEnd="24dp"
    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
    android:textColor="@*android:color/primary_text_default_material_light">
    android:textColor="@color/dialog_title">
</TextView>
Loading