UI changes in the Edit Channel option

- Rename 'Unified TV input' to 'Unified TV Input'
- Change radio buttons to check boxes in Edit Channel
- Change layout alignment
- Add a divider

Bug: 15500294
Change-Id: If4c0391485ec0cc49fe87d5ac4b3dd79573c6806

6 files changed, 71 insertions, 51 deletions

diff --git a/res/layout/edit_channels_item.xml b/res/layout/edit_channels_item.xml
index d9fc7881..77537ec8 100644
--- a/res/layout/edit_channels_item.xml
+++ b/res/layout/edit_channels_item.xml
@@ -16,51 +16,65 @@
 
 <!-- A channel in the list. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:focusable="true"
-    android:gravity="left|center_vertical"
-    android:padding="10dip">
+    android:layout_height="wrap_content"
+    android:focusable="true" >
 
-    <RadioButton
-        android:id="@+id/radio_button"
-        android:layout_height="match_parent"
-        android:layout_width="wrap_content"
-        android:gravity="left|center_vertical"
-        android:paddingLeft="@dimen/option_item_padding_left"
-        android:layout_marginLeft="@dimen/option_item_margin_left"
-        android:focusable="false"
-        android:fontFamily="@string/font" />
+    <LinearLayout
+        android:id="@+id/item_container"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:paddingLeft="@dimen/side_panel_padding_left"
+        android:gravity="left|center_vertical" >
+
+        <CheckBox
+            android:id="@+id/check_box"
+            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:gravity="left|center_vertical"
+            android:paddingLeft="@dimen/option_item_padding_left"
+            android:focusable="false"
+            android:fontFamily="@string/font" />
 
-    <!-- This is "gone" for now, since we don't have channel icons. -->
-    <ImageView android:id="@+id/channel_image_view"
-        android:layout_width="90dip"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:paddingLeft="10dip"
-        android:paddingRight="0dip"
-        android:visibility="gone" />
+        <!-- This is "gone" for now, since we don't have channel icons. -->
+        <ImageView android:id="@+id/channel_image_view"
+            android:layout_width="90dip"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:paddingLeft="10dip"
+            android:paddingRight="0dip"
+            android:visibility="gone" />
 
-    <ImageView android:id="@+id/channel_source_view"
-        android:layout_width="60dip"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:paddingLeft="10dip"
-        android:paddingRight="0dip"
-        android:scaleType="center"
-        android:visibility="gone" />
+        <ImageView android:id="@+id/channel_source_view"
+            android:layout_width="60dip"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:paddingLeft="10dip"
+            android:paddingRight="0dip"
+            android:scaleType="center"
+            android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/channel_text_view"
+        <TextView
+            android:id="@+id/channel_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:gravity="center_vertical"
+            android:paddingLeft="0dip"
+            android:paddingRight="10dip"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:marqueeRepeatLimit="1"
+            android:textSize="@dimen/option_item_text_size"
+            android:textColor="@color/side_panel_item_text" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:gravity="center_vertical"
-        android:paddingLeft="0dip"
-        android:paddingRight="10dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit="1"
-        android:textSize="@dimen/option_item_text_size"
-        android:textColor="@color/side_panel_item_text" />
-</LinearLayout>
+        android:layout_height="1.5dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:background="@color/side_panel_divider" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/option_fragment.xml b/res/layout/option_fragment.xml
index 0a983e68..d71885d1 100644
--- a/res/layout/option_fragment.xml
+++ b/res/layout/option_fragment.xml
@@ -32,15 +32,16 @@
         android:layout_width="@dimen/side_panel_width"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@color/option_fragment_background" >
+        android:background="@color/side_panel_background" >
         <LinearLayout
             android:layout_gravity="right"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/side_panel_header_padding_top"
-            android:paddingLeft="@dimen/side_panel_header_padding_left"
+            android:paddingLeft="@dimen/side_panel_padding_left"
+            android:paddingRight="@dimen/side_panel_padding_right"
             android:orientation="vertical"
-            android:background="@color/option_fragment_header_background" >
+            android:background="@color/side_panel_header_background" >
             <TextView
                 android:id="@+id/side_panel_title"
                 android:layout_width="match_parent"
@@ -48,6 +49,7 @@
                 android:gravity="center_vertical"
                 android:textSize="@dimen/side_panel_header_text_size"
                 android:textColor="@color/menu_default_text_color"
+                android:singleLine="true"
                 android:fontFamily="@string/font" />
         </LinearLayout>
 
diff --git a/res/layout/option_item.xml b/res/layout/option_item.xml
index f0e8df11..2298bd16 100644
--- a/res/layout/option_item.xml
+++ b/res/layout/option_item.xml
@@ -17,6 +17,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/option_item_height"
+    android:paddingRight="@dimen/side_panel_padding_right"
+    android:paddingLeft="@dimen/side_panel_padding_left"
     android:focusable="true"
     android:orientation="horizontal" >
 
@@ -26,9 +28,9 @@
         android:layout_width="match_parent"
         android:gravity="left|center_vertical"
         android:paddingLeft="@dimen/option_item_padding_left"
-        android:layout_marginLeft="@dimen/option_item_margin_left"
         android:textSize="@dimen/option_item_text_size"
         android:textColor="@color/side_panel_item_text"
+        android:singleLine="true"
         android:focusable="false"
         android:fontFamily="@string/font" />
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4beee366..deb26752 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,8 +29,10 @@
     <color name="menu_default_disabled_text_color">#FF777777</color>
 
     <color name="accent_color">#7FCAC3</color>
-    <color name="option_fragment_background">#384248</color>
-    <color name="option_fragment_header_background">#00A6F6</color>
+
+    <color name="side_panel_divider">#495257</color>
+    <color name="side_panel_background">#384248</color>
+    <color name="side_panel_header_background">#00A6F6</color>
 
     <color name="option_item_background">#384248</color>
     <color name="option_item_focused_background">#5C6467</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fd32950b..715999dd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,14 +41,14 @@
     <dimen name="side_panel_shadow_width">500dp</dimen>
     <dimen name="side_panel_shadow_margin_right">270dp</dimen>
     <dimen name="side_panel_width">360dp</dimen>
+    <dimen name="side_panel_padding_right">56dp</dimen>
+    <dimen name="side_panel_padding_left">32dp</dimen>
     <dimen name="side_panel_header_padding_top">27dp</dimen>
-    <dimen name="side_panel_header_padding_left">32dp</dimen>
     <dimen name="side_panel_header_text_size">24sp</dimen>
     <dimen name="side_panel_header_text_height">60dp</dimen>
 
     <!-- Option item list dimensions -->
     <dimen name="option_item_height">48dp</dimen>
-    <dimen name="option_item_margin_left">32dp</dimen>
     <dimen name="option_item_padding_left">16dp</dimen>
     <dimen name="option_item_text_size">18sp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7a31366c..a9b076eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -67,7 +67,7 @@
     <string name="menu_input_setting">Input Setting</string>
 
     <!-- Unified TV input label -->
-    <string name="unified_tv_input_label">Unified TV input</string>
+    <string name="unified_tv_input_label">Unified TV Input</string>
 
     <!-- Edit channel list (enable/disable individual channels) -->
     <string name="edit_channels_title">Edit <xliff:g id="tv_input">%s</xliff:g> channels</string>