Added main clockbar icons.

Change-Id: I18bee8c5f0fd588e34ad50650754cea9d3cee89a

11 files changed, 46 insertions, 8 deletions

diff --git a/android/sdremote/res/drawable/icon_overflow.png b/android/sdremote/res/drawable/actionbar_icon_overflow.png
index 5265c45101b2..5265c45101b2 100644
--- a/android/sdremote/res/drawable/icon_overflow.png
+++ b/android/sdremote/res/drawable/actionbar_icon_overflow.png
diff --git a/android/sdremote/res/drawable/icon_thumbs.png b/android/sdremote/res/drawable/actionbar_icon_thumbs.png
index ae10accd7ef6..ae10accd7ef6 100644
--- a/android/sdremote/res/drawable/icon_thumbs.png
+++ b/android/sdremote/res/drawable/actionbar_icon_thumbs.png
diff --git a/android/sdremote/res/drawable/actionbar_thumbs.xml b/android/sdremote/res/drawable/actionbar_thumbs.xml
index 2dbf5ea46b1a..2d03853fed76 100644
--- a/android/sdremote/res/drawable/actionbar_thumbs.xml
+++ b/android/sdremote/res/drawable/actionbar_thumbs.xml
@@ -3,7 +3,7 @@
 
     <item android:drawable="@drawable/actionbar_toggle"/>
     <item><bitmap
-        android:src="@drawable/icon_thumbs"
+        android:src="@drawable/actionbar_icon_thumbs"
         android:gravity="center"  /></item>
 
 </layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/clockbar_clock.xml b/android/sdremote/res/drawable/clockbar_clock.xml
new file mode 100644
index 000000000000..14ceb47c07df
--- /dev/null
+++ b/android/sdremote/res/drawable/clockbar_clock.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@drawable/actionbar_toggle"/>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/clockbar_icon_clock" />
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/clockbar_countdown.xml b/android/sdremote/res/drawable/clockbar_countdown.xml
new file mode 100644
index 000000000000..129d9aa4f492
--- /dev/null
+++ b/android/sdremote/res/drawable/clockbar_countdown.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@drawable/actionbar_toggle"/>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/clockbar_icon_countdown" />
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/drawable/clockbar_icon_clock.png b/android/sdremote/res/drawable/clockbar_icon_clock.png
new file mode 100644
index 000000000000..792af07edf9b
--- /dev/null
+++ b/android/sdremote/res/drawable/clockbar_icon_clock.png
diff --git a/android/sdremote/res/drawable/clockbar_icon_countdown.png b/android/sdremote/res/drawable/clockbar_icon_countdown.png
new file mode 100644
index 000000000000..19af04134595
--- /dev/null
+++ b/android/sdremote/res/drawable/clockbar_icon_countdown.png
diff --git a/android/sdremote/res/drawable/clockbar_icon_stopwatch.png b/android/sdremote/res/drawable/clockbar_icon_stopwatch.png
new file mode 100644
index 000000000000..ac0414231cbc
--- /dev/null
+++ b/android/sdremote/res/drawable/clockbar_icon_stopwatch.png
diff --git a/android/sdremote/res/drawable/clockbar_stopwatch.xml b/android/sdremote/res/drawable/clockbar_stopwatch.xml
new file mode 100644
index 000000000000..bfdab6cd89d2
--- /dev/null
+++ b/android/sdremote/res/drawable/clockbar_stopwatch.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@drawable/actionbar_toggle"/>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/clockbar_icon_stopwatch" />
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/presentation_clockbar.xml b/android/sdremote/res/layout/presentation_clockbar.xml
index 5ab708125cd9..cde3c9598c1c 100644
--- a/android/sdremote/res/layout/presentation_clockbar.xml
+++ b/android/sdremote/res/layout/presentation_clockbar.xml
@@ -2,29 +2,34 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="#BB000000">
+    android:background="#EE313131"
+    android:orientation="horizontal" >
 
     <ToggleButton
         android:id="@+id/clockbar_toggle_clockmode"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-
-        android:text="ToggleButton" />
+        android:background="@drawable/clockbar_clock"
+        android:textOff=""
+        android:textOn="" />
 
     <ToggleButton
         android:id="@+id/clockbar_toggle_stopwatchmode"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@drawable/actionbar_toggle" />
+        android:background="@drawable/clockbar_stopwatch"
+        android:textOff=""
+        android:textOn="" />
 
     <ToggleButton
         android:id="@+id/clockbar_toggle_countdownmode"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@drawable/actionbar_toggle" />
+        android:background="@drawable/clockbar_countdown"
+        android:textOff=""
+        android:textOn="" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/menu/actionbar_presentation.xml b/android/sdremote/res/menu/actionbar_presentation.xml
index a48aad563b9c..cd88ddc3b5c0 100644
--- a/android/sdremote/res/menu/actionbar_presentation.xml
+++ b/android/sdremote/res/menu/actionbar_presentation.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/actionbar_presentation_submenu"
         android:showAsAction="always"
-        android:icon="@drawable/icon_overflow">
+        android:icon="@drawable/actionbar_icon_overflow">
         <menu>
             <item
                 android:id="@+id/actionbar_presentation_submenu_blank"