Adjust color on TV app

BUG: 16652362
Change-Id: If184fd19d04e25dc738d266dccbcbc284675cd89

6 files changed, 53 insertions, 16 deletions

diff --git a/res/drawable/channel_tile_bottom.xml b/res/drawable/channel_tile_bottom.xml
index 7c5c0aa3..f87115dc 100644
--- a/res/drawable/channel_tile_bottom.xml
+++ b/res/drawable/channel_tile_bottom.xml
@@ -15,10 +15,7 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/channel_tile_bottom"/>
-    <corners android:radius="2dp"
-        android:topLeftRadius="2dp"
-        android:topRightRadius="2dp"
-        android:bottomLeftRadius="2dp"
-        android:bottomRightRadius="2dp"/>
+    <solid android:color="@color/channel_tile_bottom" />
+    <corners android:bottomLeftRadius="@dimen/channel_tile_round_radius"
+        android:bottomRightRadius="@dimen/channel_tile_round_radius"/>
 </shape>
\ No newline at end of file
diff --git a/res/drawable/channel_tile_guide_bottom.xml b/res/drawable/channel_tile_guide_bottom.xml
new file mode 100644
index 00000000..0647bcfe
--- /dev/null
+++ b/res/drawable/channel_tile_guide_bottom.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/channel_tile_guide_bottom" />
+    <corners android:bottomLeftRadius="@dimen/channel_tile_round_radius"
+        android:bottomRightRadius="@dimen/channel_tile_round_radius"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/channel_tile_guide_top.xml b/res/drawable/channel_tile_guide_top.xml
new file mode 100644
index 00000000..93594693
--- /dev/null
+++ b/res/drawable/channel_tile_guide_top.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/channel_tile_guide_top" />
+    <corners android:radius="@dimen/channel_tile_round_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/channel_tile_top.xml b/res/drawable/channel_tile_top.xml
index 96827419..ed309fce 100644
--- a/res/drawable/channel_tile_top.xml
+++ b/res/drawable/channel_tile_top.xml
@@ -15,10 +15,6 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/channel_tile_top"/>
-    <corners android:radius="@dimen/channel_tile_round_radius"
-        android:topLeftRadius="@dimen/channel_tile_round_radius"
-        android:topRightRadius="@dimen/channel_tile_round_radius"
-        android:bottomLeftRadius="@dimen/channel_tile_round_radius"
-        android:bottomRightRadius="@dimen/channel_tile_round_radius"/>
+    <solid android:color="@color/channel_tile_top" />
+    <corners android:radius="@dimen/channel_tile_round_radius" />
 </shape>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3bdb3aae..bdebe531 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,10 +15,12 @@
 -->
 
 <resources>
+    <color name="channel_tile_guide_top">#455A64</color>
+    <color name="channel_tile_guide_bottom">#384248</color>
 
-    <color name="channel_tile_top">#03A9F4</color>
+    <color name="channel_tile_top">#0288D1</color>
     <color name="channel_tile_top_on_image">#66000000</color>
-    <color name="channel_tile_bottom">#0288D1</color>
+    <color name="channel_tile_bottom">#0176BC</color>
     <color name="channel_tile_text_color">#FFEEEEEE</color>
 
     <color name="focused_list_title">#FFEEEEEE</color>
@@ -32,7 +34,7 @@
 
     <color name="side_panel_divider">#495257</color>
     <color name="side_panel_background">#384248</color>
-    <color name="side_panel_header_background">#00A6F6</color>
+    <color name="side_panel_header_background">#0288D1</color>
 
     <color name="option_item_background">#384248</color>
     <color name="option_item_focused_background">#5C6467</color>
diff --git a/src/com/android/tv/ui/ChannelTileView.java b/src/com/android/tv/ui/ChannelTileView.java
index 41be9072..6e755071 100644
--- a/src/com/android/tv/ui/ChannelTileView.java
+++ b/src/com/android/tv/ui/ChannelTileView.java
@@ -99,13 +99,14 @@ public class ChannelTileView extends ShadowContainer
         setTag(MainMenuView.MenuTag.buildTag(mChannel));
 
         if (mChannel.getType() == R.integer.channel_type_guide) {
-            mChannelInfosLayout.setBackground(mNormalBackgroud);
+            mChannelInfosLayout.setBackgroundResource(R.drawable.channel_tile_guide_top);
             mChannelNumberView.setVisibility(INVISIBLE);
             mChannelNameView.setVisibility(INVISIBLE);
             mProgramPosterArtView.setVisibility(INVISIBLE);
             mChannelLogoView.setImageResource(R.drawable.ic_channel_guide);
             mChannelLogoView.setVisibility(VISIBLE);
             mProgramNameView.setText(R.string.menu_program_guide);
+            mProgramNameView.setBackgroundResource(R.drawable.channel_tile_guide_bottom);
         } else {
             mChannelNumberView.setText(mChannel.getDisplayNumber());
             mChannelNumberView.setVisibility(VISIBLE);