Merge "Change progress bar color" into gb-ub-photos-denali

10 files changed, 28 insertions, 0 deletions

diff --git a/res/drawable-hdpi/progress_bg.9.png b/res/drawable-hdpi/progress_bg.9.png
new file mode 100644
index 000000000..eef306b34
--- /dev/null
+++ b/res/drawable-hdpi/progress_bg.9.png
diff --git a/res/drawable-hdpi/progress_primary.9.png b/res/drawable-hdpi/progress_primary.9.png
new file mode 100644
index 000000000..b3fa8baf8
--- /dev/null
+++ b/res/drawable-hdpi/progress_primary.9.png
diff --git a/res/drawable-mdpi/progress_bg.9.png b/res/drawable-mdpi/progress_bg.9.png
new file mode 100644
index 000000000..85a7750f8
--- /dev/null
+++ b/res/drawable-mdpi/progress_bg.9.png
diff --git a/res/drawable-mdpi/progress_primary.9.png b/res/drawable-mdpi/progress_primary.9.png
new file mode 100644
index 000000000..2ed1b66a5
--- /dev/null
+++ b/res/drawable-mdpi/progress_primary.9.png
diff --git a/res/drawable-xhdpi/progress_bg.9.png b/res/drawable-xhdpi/progress_bg.9.png
new file mode 100644
index 000000000..d98b092a0
--- /dev/null
+++ b/res/drawable-xhdpi/progress_bg.9.png
diff --git a/res/drawable-xhdpi/progress_primary.9.png b/res/drawable-xhdpi/progress_primary.9.png
new file mode 100644
index 000000000..c8607f70d
--- /dev/null
+++ b/res/drawable-xhdpi/progress_primary.9.png
diff --git a/res/drawable-xxhdpi/progress_bg.9.png b/res/drawable-xxhdpi/progress_bg.9.png
new file mode 100644
index 000000000..21e454d74
--- /dev/null
+++ b/res/drawable-xxhdpi/progress_bg.9.png
diff --git a/res/drawable-xxhdpi/progress_primary.9.png b/res/drawable-xxhdpi/progress_primary.9.png
new file mode 100644
index 000000000..89e882336
--- /dev/null
+++ b/res/drawable-xxhdpi/progress_primary.9.png
diff --git a/res/drawable/bottom_progress_bar.xml b/res/drawable/bottom_progress_bar.xml
new file mode 100644
index 000000000..fa8d3adce
--- /dev/null
+++ b/res/drawable/bottom_progress_bar.xml
@@ -0,0 +1,27 @@
+<?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"
+        android:drawable="@drawable/progress_bg" />
+
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%"
+               android:drawable="@drawable/progress_primary" />
+    </item>
+
+</layer-list>
diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml
index a66e7ab36..a13585c64 100644
--- a/res/layout/filmstrip_bottom_controls.xml
+++ b/res/layout/filmstrip_bottom_controls.xml
@@ -118,6 +118,7 @@
             <ProgressBar
                 android:id="@+id/bottom_session_progress_bar"
                 style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
+                android:progressDrawable="@drawable/bottom_progress_bar"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1" />