Merge "Tweak battery usage to match red lines." into lmp-preview-dev

This commit is contained in:
Dianne Hackborn
2014-06-03 00:21:29 +00:00
committed by Android (Google) Code Review
12 changed files with 237 additions and 130 deletions

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
<!-- 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.
@@ -16,22 +16,19 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="#ff28262c" />
</shape>
<nine-patch android:src="@*android:drawable/progress_qntm_alpha"
android:tint="@color/quantum_empty_color_light" />
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<solid android:color="#c050ade5" />
</shape>
</clip>
<scale android:scaleWidth="100%">
<nine-patch android:src="@*android:drawable/progress_qntm_alpha"
android:tint="?android:attr/colorControlActivated" />
</scale>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="#c050ade5" />
</shape>
</clip>
<scale android:scaleWidth="100%">
<nine-patch android:src="@*android:drawable/progress_primary_qntm_alpha"
android:tint="?android:attr/colorControlActivated" />
</scale>
</item>
</layer-list>