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

Commit c9d258a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Misc GAR fixes" into pi-dev

parents 346063dd 3ab53bbd

res/drawable/selectable_card_grey.xml

deleted100644 → 0
+0 −22
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.

-->



<ripple

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

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

    <item android:drawable="?android:attr/colorSecondary"/>

</ripple>

res/layout/battery_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
    android:orientation="horizontal"

    android:paddingTop="24dp"

    android:paddingBottom="24dp"

    android:background="@drawable/selectable_card_grey"

    style="@style/EntityHeader">



    <LinearLayout

res/layout/data_usage_summary_preference.xml

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="vertical"

    android:background="@drawable/selectable_card_grey"

    android:selectable="false"

    style="@style/EntityHeader">
@@ -31,7 +30,7 @@ 
        android:id="@+id/usage_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textColor="?android:attr/colorAccent"

        android:textColor="?android:attr/textColorPrimary"

        android:text="@string/data_usage_title" />



    <com.android.settings.datausage.MeasurableLinearLayout

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ 
    </style>



    <style name="EntityHeader">

        <item name="android:background">?android:attr/colorSecondary</item>

        <item name="android:background">?android:attr/colorPrimary</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:paddingTop">16dp</item>

        <item name="android:paddingStart">16dp</item>

src/com/android/settings/widget/EntityHeaderController.java

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ public class EntityHeaderController { 
            return this;

        }

        actionBar.setBackgroundDrawable(

                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));

                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimary)));

        actionBar.setElevation(0);

        if (mRecyclerView != null && mLifecycle != null) {

            ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);