diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-11 00:42:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-11 00:42:38 +0000 |
| commit | 172e76600f3a7721ec6f441dc6cdb6386e59006f (patch) | |
| tree | cc4d0234f5021d230826abc150bd0ba9ec4a6f78 /res | |
| parent | 1f2feca205bdd810dcc2fd020522a089fdabb4a1 (diff) | |
| parent | 9c3d6909e7b0a29f3f189e26ac541dada0b70d05 (diff) | |
| download | packages_apps_Settings-172e76600f3a7721ec6f441dc6cdb6386e59006f.zip packages_apps_Settings-172e76600f3a7721ec6f441dc6cdb6386e59006f.tar.gz packages_apps_Settings-172e76600f3a7721ec6f441dc6cdb6386e59006f.tar.bz2 | |
Merge "Replace data_usage_bar with progress background tint"
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/data_usage_bar.xml | 35 | ||||
| -rw-r--r-- | res/layout/app_percentage_item.xml | 2 |
2 files changed, 1 insertions, 36 deletions
diff --git a/res/drawable/data_usage_bar.xml b/res/drawable/data_usage_bar.xml deleted file mode 100644 index ec6bd90..0000000 --- a/res/drawable/data_usage_bar.xml +++ /dev/null @@ -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> diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml index 83d88e0..64146d9 100644 --- a/res/layout/app_percentage_item.xml +++ b/res/layout/app_percentage_item.xml @@ -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 |