Merge "Replace data_usage_bar with progress background tint"

This commit is contained in:
Alan Viverette
2015-02-11 00:42:36 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 36 deletions

View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
android:tint="@color/material_empty_color_light" />
</item>
<item android:id="@android:id/secondaryProgress">
<scale android:scaleWidth="100%">
<nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
android:tint="?android:attr/colorControlActivated"
android:alpha="0.5" />
</scale>
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
android:tint="?android:attr/colorControlActivated" />
</scale>
</item>
</layer-list>

View File

@@ -57,7 +57,7 @@
android:layout_gravity="fill_horizontal|top"
android:layout_marginTop="4dip"
android:max="100"
android:progressDrawable="@drawable/data_usage_bar"
android:progressBackgroundTint="@android:color/transparent"
style="?android:attr/progressBarStyleHorizontal" />
<TextView