From db04f9a326f876c093b52c41c0f524a705dc777d Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Thu, 10 Jan 2013 13:06:32 -0800
Subject: [PATCH] Bug 817739: Theme change for synced tabs. [r=mfinkle]

--HG--
extra : rebase_source : 9b10d242c2c560489974cf7f23c5418a8370fc8a
---
 mobile/android/base/Makefile.in               |  2 +-
 mobile/android/base/RemoteTabs.java           |  4 +--
 mobile/android/base/TabsPanel.java            |  5 ++-
 .../drawable/remote_tabs_child_divider.xml    | 12 +++++++
 .../drawable/tabs_tray_list_divider.xml       | 26 ---------------
 .../layout-xlarge-v11/remote_tabs_child.xml   | 32 +++++++++++++------
 .../layout-xlarge-v11/remote_tabs_group.xml   | 26 +++++++--------
 .../tabs_panel_toolbar_menu.xml               |  3 +-
 .../resources/layout/remote_tabs_child.xml    | 32 +++++++++++++------
 .../resources/layout/remote_tabs_group.xml    | 22 ++++++-------
 .../base/resources/layout/tabs_panel.xml.in   |  5 ++-
 .../resources/values-xlarge-v11/dimens.xml    |  5 +--
 .../android/base/resources/values/dimens.xml  |  3 +-
 .../android/base/resources/values/styles.xml  | 22 ++++++++++---
 14 files changed, 114 insertions(+), 85 deletions(-)
 create mode 100644 mobile/android/base/resources/drawable/remote_tabs_child_divider.xml
 delete mode 100644 mobile/android/base/resources/drawable/tabs_tray_list_divider.xml

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 13dc1520ace..6cdd8aa633a 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -1075,6 +1075,7 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/progress_spinner_10.png                \
   mobile/android/base/resources/drawable/progress_spinner_11.png                \
   mobile/android/base/resources/drawable/progress_spinner_12.png                \
+  mobile/android/base/resources/drawable/remote_tabs_child_divider.xml          \
   mobile/android/base/resources/drawable/remote_tabs_level.xml                  \
   mobile/android/base/resources/drawable/start.png                              \
   mobile/android/base/resources/drawable/site_security_level.xml                \
@@ -1087,7 +1088,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tabs_tray_selected_bg_repeat.xml       \
   mobile/android/base/resources/drawable/tabs_tray_active_selector.xml          \
   mobile/android/base/resources/drawable/tabs_tray_default_selector.xml         \
-  mobile/android/base/resources/drawable/tabs_tray_list_divider.xml             \
   mobile/android/base/resources/drawable/tabs_shadow.xml                        \
   mobile/android/base/resources/drawable/shadow.png                             \
   mobile/android/base/resources/drawable/marketplace.png                        \
diff --git a/mobile/android/base/RemoteTabs.java b/mobile/android/base/RemoteTabs.java
index dab5143d0b2..84c38f35441 100644
--- a/mobile/android/base/RemoteTabs.java
+++ b/mobile/android/base/RemoteTabs.java
@@ -29,9 +29,9 @@ public class RemoteTabs extends ExpandableListView
     private static ArrayList <ArrayList <HashMap <String, String>>> mTabsList;
 
     private static final String[] CLIENT_KEY = new String[] { "name" };
-    private static final String[] TAB_KEY = new String[] { "title" };
+    private static final String[] TAB_KEY = new String[] { "title", "url" };
     private static final int[] CLIENT_RESOURCE = new int[] { R.id.client };
-    private static final int[] TAB_RESOURCE = new int[] { R.id.tab };
+    private static final int[] TAB_RESOURCE = new int[] { R.id.tab, R.id.url };
 
     public RemoteTabs(Context context, AttributeSet attrs) {
         super(context, attrs);
diff --git a/mobile/android/base/TabsPanel.java b/mobile/android/base/TabsPanel.java
index 2b046bf7658..93ca3737dff 100644
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -68,9 +68,6 @@ public class TabsPanel extends TabHost
     private GeckoPopupMenu mTabsPopupMenu;
     private Menu mTabsMenu;
 
-    private static final int REMOTE_TABS_HIDDEN = 1;
-    private static final int REMOTE_TABS_SHOWN = 2;
-
     public TabsPanel(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
@@ -377,9 +374,11 @@ public class TabsPanel extends TabHost
 
         if (mCurrentPanel == Panel.REMOTE_TABS) {
             mAddTab.setVisibility(View.INVISIBLE);
+            mMenuButton.setVisibility(View.INVISIBLE);
         } else {
             mAddTab.setVisibility(View.VISIBLE);
             mAddTab.setImageLevel(index);
+            mMenuButton.setVisibility(View.VISIBLE);
         }
 
         if (isSideBar()) {
diff --git a/mobile/android/base/resources/drawable/remote_tabs_child_divider.xml b/mobile/android/base/resources/drawable/remote_tabs_child_divider.xml
new file mode 100644
index 00000000000..1965112bcfa
--- /dev/null
+++ b/mobile/android/base/resources/drawable/remote_tabs_child_divider.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+       <size android:height="1dp"/>
+       <solid android:color="#FF313131"/>
+
+</shape>
diff --git a/mobile/android/base/resources/drawable/tabs_tray_list_divider.xml b/mobile/android/base/resources/drawable/tabs_tray_list_divider.xml
deleted file mode 100644
index 178b218a2c2..00000000000
--- a/mobile/android/base/resources/drawable/tabs_tray_list_divider.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-
-        <shape android:shape="rectangle">
-             <size android:height="1dp"/>
-             <solid android:color="#4C5157"/>
-        </shape>
-
-    </item>
-
-    <item android:top="1dp">
-
-        <shape android:shape="rectangle">
-             <size android:height="1dp"/>
-             <solid android:color="#7A7E81"/>
-        </shape>
-
-    </item>
-
-</layer-list>
diff --git a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_child.xml b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_child.xml
index c022e995b2e..35df9110190 100644
--- a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_child.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_child.xml
@@ -3,13 +3,25 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/tab"
-          android:layout_width="fill_parent"
-          android:layout_height="@dimen/remote_tab_child_row_height"
-          style="@style/TabRowTextAppearance"
-          android:paddingLeft="10dip"
-          android:paddingRight="10dip"
-          android:textSize="14sp"
-          android:background="@drawable/tabs_tray_default_selector"
-          android:gravity="center_vertical"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="@dimen/remote_tab_child_row_height"
+              android:gravity="center_vertical"
+              android:orientation="vertical"
+              android:background="@drawable/tabs_tray_default_selector"
+              android:paddingLeft="2dp"
+              android:paddingRight="2dp">
+
+    <TextView android:id="@+id/tab"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              style="@style/RemoteTabRowTextAppearance"
+              android:textSize="14sp"/>
+
+    <TextView android:id="@+id/url"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              style="@style/RemoteTabRowTextAppearance.Url"
+              android:textSize="12sp"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
index d046eab2d80..0ba18e6bdbd 100644
--- a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
@@ -3,16 +3,16 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/client"
-          android:layout_width="fill_parent"
-          android:layout_height="@dimen/remote_tab_group_row_height"
-          style="@style/TabRowTextAppearance"
-          android:paddingLeft="10dip"
-          android:paddingRight="10dip"
-          android:textStyle="bold"
-          android:textSize="13sp"
-          android:singleLine="false"
-          android:maxLines="2"
-          android:background="@drawable/tabs_tray_selected_bg_repeat"
-          android:gravity="center_vertical"/>
+<Gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:id="@+id/client"
+                       android:layout_width="fill_parent"
+                       android:layout_height="@dimen/remote_tab_group_row_height"
+                       style="@style/RemoteTabRowTextAppearance.Url"
+                       android:background="@android:color/transparent"
+                       android:paddingLeft="2dip"
+                       android:paddingRight="2dip"
+                       android:textStyle="bold"
+                       android:textSize="12sp"
+                       android:singleLine="false"
+                       android:maxLines="2"
+                       android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml b/mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml
index ad083b3ac1e..1a686d335ef 100644
--- a/mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml
@@ -15,7 +15,8 @@
             android:layout_height="fill_parent"
             android:layout_weight="1.0"
             android:text="@string/tabs_normal"
-            android:textColor="@color/tabs_counter_color"
+            android:textColor="#FFFFFFFF"
+            android:textSize="18sp"
             android:background="@drawable/action_bar_button"/>
 
     <ImageButton android:id="@+id/add_tab"
diff --git a/mobile/android/base/resources/layout/remote_tabs_child.xml b/mobile/android/base/resources/layout/remote_tabs_child.xml
index 3c13aec0566..5f4ce532474 100644
--- a/mobile/android/base/resources/layout/remote_tabs_child.xml
+++ b/mobile/android/base/resources/layout/remote_tabs_child.xml
@@ -3,13 +3,25 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/tab"
-          android:layout_width="fill_parent"
-          android:layout_height="@dimen/remote_tab_child_row_height"
-          style="@style/TabRowTextAppearance"
-          android:paddingLeft="10dip"
-          android:paddingRight="10dip"
-          android:textSize="16sp"
-          android:background="@drawable/tabs_tray_default_selector"
-          android:gravity="center_vertical"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="@dimen/remote_tab_child_row_height"
+              android:gravity="center_vertical"
+              android:orientation="vertical"
+              android:background="@drawable/tabs_tray_default_selector"
+              android:paddingLeft="4dp"
+              android:paddingRight="4dp">
+
+    <TextView android:id="@+id/tab"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              style="@style/RemoteTabRowTextAppearance"
+              android:textSize="18sp"/>
+
+    <TextView android:id="@+id/url"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              style="@style/RemoteTabRowTextAppearance.Url"
+              android:textSize="14sp"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/remote_tabs_group.xml b/mobile/android/base/resources/layout/remote_tabs_group.xml
index c3c924fbc66..29a62485e65 100644
--- a/mobile/android/base/resources/layout/remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout/remote_tabs_group.xml
@@ -3,14 +3,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/client"
-          android:layout_width="fill_parent"
-          android:layout_height="@dimen/remote_tab_group_row_height"
-          style="@style/TabRowTextAppearance"
-          android:paddingLeft="10dip"
-          android:paddingRight="10dip"
-          android:textStyle="bold"
-          android:textSize="14sp"
-          android:background="@drawable/tabs_tray_selected_bg_repeat"
-          android:gravity="center_vertical"/>
+<Gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:id="@+id/client"
+                       android:layout_width="fill_parent"
+                       android:layout_height="@dimen/remote_tab_group_row_height"
+                       style="@style/RemoteTabRowTextAppearance.Url"
+                       android:background="@android:color/transparent"
+                       android:paddingLeft="4dp"
+                       android:paddingRight="4dp"
+                       android:textStyle="bold"
+                       android:textSize="14sp"
+                       android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/tabs_panel.xml.in b/mobile/android/base/resources/layout/tabs_panel.xml.in
index 34c3de67efe..77b8a80c216 100644
--- a/mobile/android/base/resources/layout/tabs_panel.xml.in
+++ b/mobile/android/base/resources/layout/tabs_panel.xml.in
@@ -40,7 +40,10 @@
             <org.mozilla.gecko.RemoteTabs android:id="@+id/synced_tabs"
                                           style="@style/RemoteTabsList"
                                           android:layout_width="fill_parent"
-                                          android:layout_height="fill_parent"/>
+                                          android:layout_height="fill_parent"
+                                          android:paddingLeft="@dimen/tabs_panel_list_padding"
+                                          android:paddingRight="@dimen/tabs_panel_list_padding"
+                                          android:scrollbarStyle="outsideOverlay"/>
 
         </view>
 
diff --git a/mobile/android/base/resources/values-xlarge-v11/dimens.xml b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
index 673492c4994..914a59791f0 100644
--- a/mobile/android/base/resources/values-xlarge-v11/dimens.xml
+++ b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
@@ -13,9 +13,10 @@
     <dimen name="awesomebar_tab_transparency_height">46dp</dimen>
     <dimen name="browser_toolbar_height">56dp</dimen>
     <dimen name="local_tab_row_height">150dp</dimen>
-    <dimen name="remote_tab_child_row_height">48dp</dimen>
-    <dimen name="remote_tab_group_row_height">28dp</dimen>
+    <dimen name="remote_tab_child_row_height">56dp</dimen>
+    <dimen name="remote_tab_group_row_height">34dp</dimen>
     <dimen name="tabs_counter_size">26sp</dimen>
+    <dimen name="tabs_panel_list_padding">8dip</dimen>
     <dimen name="addressbar_offset_left">84dip</dimen>
 
 </resources>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 4bd35dfcefc..626f9855e9b 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -42,12 +42,13 @@
     <dimen name="prompt_service_icon_text_padding">10dp</dimen>
     <dimen name="prompt_service_left_right_text_with_icon_padding">10dp</dimen>
     <dimen name="prompt_service_top_bottom_text_with_icon_padding">8dp</dimen>
-    <dimen name="remote_tab_child_row_height">54dp</dimen>
+    <dimen name="remote_tab_child_row_height">64dp</dimen>
     <dimen name="remote_tab_group_row_height">26dp</dimen>
     <dimen name="popup_width">400dp</dimen>
     <dimen name="tab_thumbnail_height">78dp</dimen>
     <dimen name="tab_thumbnail_width">136dp</dimen>
     <dimen name="tabs_counter_size">22sp</dimen>
+    <dimen name="tabs_panel_list_padding">16dip</dimen>
     <dimen name="tabs_list_divider_height">2dp</dimen>
     <dimen name="text_selection_handle_width">30dp</dimen>
     <dimen name="text_selection_handle_height">44dp</dimen>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 9cb092002f9..52f47c58686 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -139,19 +139,21 @@
     <style name="TabsList" parent="android:style/Widget.ListView">
          <item name="android:background">@android:color/transparent</item>
          <item name="android:cacheColorHint">@android:color/transparent</item>
-         <item name="android:divider">@drawable/tabs_tray_list_divider</item>
-         <item name="android:dividerHeight">2dip</item>
+         <item name="android:divider">@android:color/transparent</item>
+         <item name="android:dividerHeight">0dip</item>
+         <item name="android:listSelector">@android:color/transparent</item>
     </style>
 
     <!-- RemoteTabsList -->
     <style name="RemoteTabsList" parent="TabsList">
-         <item name="android:childDivider">@drawable/tabs_tray_list_divider</item>
+         <item name="android:dividerHeight">1dip</item>
+         <item name="android:childDivider">@drawable/remote_tabs_child_divider</item>
          <item name="android:groupIndicator">@android:color/transparent</item>
     </style>
 
     <!-- TabsTray Row -->
     <style name="TabRowTextAppearance">
-        <item name="android:textColor">#E5F2FF</item>
+        <item name="android:textColor">#FFFFFFFF</item>
         <item name="android:shadowColor">#7F000000</item>
         <item name="android:shadowRadius">1</item>
         <item name="android:shadowDx">0</item>
@@ -160,6 +162,18 @@
         <item name="android:ellipsize">middle</item>
     </style>
 
+    <!-- RemoteTabs Row -->
+    <style name="RemoteTabRowTextAppearance">
+        <item name="android:textColor">#FFFFFFFF</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">middle</item>
+    </style>
+
+    <!-- RemoteTabs Row Url -->
+    <style name="RemoteTabRowTextAppearance.Url">
+        <item name="android:textColor">#FFA4A7A9</item>
+    </style>
+
     <!-- TabWidget --> 
     <style name="TabWidget">
         <item name="android:layout_width">wrap_content</item>