Remove LinearColorBar and replace uses with ProgressBar.

We never actually needed it, since progress bar can do
everything we want it to. Renamed data_usage_progress to
color_bar_progress to reflect its more generic state.

Updated color_bar_progress to use proper values.
Since we can't seem to use private attrs in settings,
use the dimen/color values that are customizable.

Updated usages to use regular ProgressBar APIs.

Fixes: 74111937
Test: visual inspection and robotests
Change-Id: I4f0c59e6cf5c629e3cc3901800d9c4afc95fa495
This commit is contained in:
Andrew Sapperstein
2018-03-18 15:53:09 -07:00
parent b0f251597c
commit 38bf192ed6
14 changed files with 61 additions and 348 deletions

View File

@@ -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>

View File

@@ -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">