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

Commit f15dc577 authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

Merge "Update the navigation drawer activated style"

parents 5158d8f9 1d738fb2

res/drawable/root_item_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:color="?android:attr/colorControlHighlight">

    <item

        android:id="@android:id/mask"

        android:drawable="@android:color/white"/>

        android:drawable="@drawable/root_list_selector_mask"/>



    <item>

        <selector>

res/drawable/root_list_selector.xml

+14 −13
Original line number Diff line number Diff line
@@ -13,16 +13,17 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

       android:inset="8dp">

    <shape

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

        android:shape="rectangle">

        <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="0dp"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>



            android:topLeftRadius="2dp"

            android:topRightRadius="2dp"

            android:bottomLeftRadius="2dp"

            android:bottomRightRadius="2dp"/>

        <solid

            android:color="?android:attr/colorControlHighlight"/>

    </shape>

</inset>
 
 No newline at end of file

res/drawable/root_list_selector_mask.xml

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

<!-- Copyright (C) 2016 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.

-->

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

       android:inset="8dp">

    <shape

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

        android:shape="rectangle">

        <corners

            android:topLeftRadius="2dp"

            android:topRightRadius="2dp"

            android:bottomLeftRadius="2dp"

            android:bottomRightRadius="2dp"/>

        <solid

            android:color="@android:color/white"/>

    </shape>

</inset>
 
 No newline at end of file

res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 
        <attr name="android:textColorPrimary" />

    </declare-styleable>



    <declare-styleable name="DrawerMenuTitle">

        <attr name="android:textColor" />

        <attr name="android:textSize" />

    </declare-styleable>



    <declare-styleable name="CardView">

        <attr name="colorBackgroundFloating" format="color" />

    </declare-styleable>

res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
    <color name="band_select_background">#88ffffff</color>

    <color name="band_select_border">#44000000</color>



    <color name="drawer_title_color">?android:attr/textColorPrimary</color>



    <color name="root_title_color">#de000000</color>

    <color name="root_activated_color">#ff127beb</color>

    <color name="root_details_color">#8a000000</color>