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

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

Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev

parents a976a0ea 38bf192e

res/color/white_disabled.xml

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

-->



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

    <item android:color="@android:color/white"

        android:alpha="?android:attr/disabledAlpha" />

</selector>

res/drawable/data_usage_progress.xml→res/drawable/color_bar_progress.xml

+8 −8
Original line number Diff line number Diff line
@@ -16,19 +16,19 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle"

               android:tint="?android:attr/colorControlActivated">

            <corners android:radius="5dp" />

               android:tint="@*android:color/config_progress_background_tint">

            <corners android:radius="@*android:dimen/config_progressBarCornerRadius" />

            <size android:height="10dp" />

            <solid android:color="@color/white_disabled" />

            <solid android:color="@*android:color/white_disabled_material" />

        </shape>

    </item>

    </item>r

    <item android:id="@android:id/secondaryProgress">

        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle"

                   android:tint="?android:attr/colorControlActivated">

                <corners android:radius="5dp" />

                <corners android:radius="@*android:dimen/config_progressBarCornerRadius" />

                <size android:height="10dp" />

                <solid android:color="@color/white_disabled" />

                <solid android:color="@*android:color/white_disabled_material" />

            </shape>

        </scale>

    </item>
@@ -36,9 +36,9 @@ 
        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle"

                   android:tint="?android:attr/colorControlActivated">

                <corners android:radius="5dp" />

                <corners android:radius="@*android:dimen/config_progressBarCornerRadius" />

                <size android:height="10dp" />

                <solid android:color="@android:color/black" />

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

            </shape>

        </scale>

    </item>

res/drawable/ring_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
            android:thickness="@dimen/ring_progress_bar_thickness"

            android:useLevel="false"

            android:tint="?android:colorControlNormal">

            <solid android:color="@color/white_disabled" />

            <solid android:color="@*android:color/white_disabled_material" />

        </shape>

    </item>

    <item android:id="@android:id/progress">

res/layout/data_usage_summary_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ 
        android:id="@+id/determinateBar"

        style="?android:attr/progressBarStyleHorizontal"

        android:layout_width="match_parent"

        android:layout_height="10dp"

        android:progressDrawable="@drawable/data_usage_progress"/>

        android:layout_height="wrap_content"

        android:progressDrawable="@drawable/color_bar_progress"/>



    <LinearLayout

        android:id="@+id/label_bar"

res/layout/running_processes_header.xml

+4 −3
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ 
        android:gravity="left|center_vertical"

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



    <view class="com.android.settings.widget.LinearColorBar"

    <ProgressBar

        android:id="@+id/color_bar"

        style="?android:attr/progressBarStyleHorizontal"

        android:layout_width="match_parent"

        android:layout_height="16sp"

        android:orientation="horizontal" />

        android:layout_height="wrap_content"

        android:progressDrawable="@drawable/color_bar_progress"/>



    <LinearLayout

        android:layout_width="match_parent"