From eb4c1bcd28436d63770b207a43826e1f2af39c55 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Fri, 30 May 2014 12:13:25 -0700
Subject: [PATCH] Bug 1014999 - Add remote tabs setup/verification panels for
 tablet. r=lucasr

---
 .../values-large-land-v11/styles.xml          | 32 +++++++++++++++++++
 .../android/base/resources/values/styles.xml  | 15 +++++----
 .../base/tabspanel/RemoteTabsSetupPanel.java  |  6 ----
 .../RemoteTabsVerificationPanel.java          |  6 ----
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/mobile/android/base/resources/values-large-land-v11/styles.xml b/mobile/android/base/resources/values-large-land-v11/styles.xml
index 1c016e63e67d..3871928d9568 100644
--- a/mobile/android/base/resources/values-large-land-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-land-v11/styles.xml
@@ -51,4 +51,36 @@
         <item name="android:paddingTop">30dp</item>
     </style>
 
+    <!-- Remote tabs panel -->
+    <style name="RemoteTabsPanelChild" parent="RemoteTabsPanelChildBase">
+        <item name="android:paddingTop">32dp</item>
+        <!-- Additional spacing set via margins on RemoteTabsSection. -->
+        <item name="android:paddingLeft">0dp</item>
+        <item name="android:paddingRight">0dp</item>
+    </style>
+
+    <style name="RemoteTabsSection" parent="RemoteTabsSectionBase">
+        <!-- To override the values-land style. -->
+    </style>
+
+    <style name="RemoteTabsItem" parent="RemoteTabsItemBase">
+        <!-- To override the values-land style. -->
+    </style>
+
+    <style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:paddingLeft">36dp</item>
+        <item name="android:paddingRight">36dp</item>
+        <item name="android:textSize">16dp</item>
+    </style>
+
+    <style name="RemoteTabsItem.TextAppearance.Header.FXAccounts">
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="RemoteTabsItem.TextAppearance.Linkified.Resend">
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
 </resources>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index afc8fd5c0f3f..7d764aacf47e 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -452,11 +452,12 @@
     <style name="RemoteTabsPanelChildBase">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingTop">62dp</item>
+        <item name="android:orientation">vertical</item>
     </style>
 
     <style name="RemoteTabsPanelChild" parent="RemoteTabsPanelChildBase">
-        <item name="android:orientation">vertical</item>
-        <item name="android:paddingTop">62dp</item>
+        <!-- We set values in landscape. -->
     </style>
 
     <style name="RemoteTabsSectionBase">
@@ -469,16 +470,16 @@
         <!-- We set values in landscape. -->
     </style>
 
-    <style name="RemoteTabsSection.Resend" parent="RemoteTabsSectionBase">
-        <!-- We set values in landscape. -->
-    </style>
-
-    <style name="RemoteTabsItem">
+    <style name="RemoteTabsItemBase">
         <item name="android:layout_marginBottom">28dp</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center</item>
     </style>
 
+    <style name="RemoteTabsItem" parent="RemoteTabsItemBase">
+        <!-- We set values in landscape. -->
+    </style>
+
     <style name="RemoteTabsItem.ButtonBase">
         <item name="android:background">@drawable/remote_tabs_setup_button_background</item>
         <item name="android:textColor">#FFFEFF</item>
diff --git a/mobile/android/base/tabspanel/RemoteTabsSetupPanel.java b/mobile/android/base/tabspanel/RemoteTabsSetupPanel.java
index cd89041d0235..6b594760007e 100644
--- a/mobile/android/base/tabspanel/RemoteTabsSetupPanel.java
+++ b/mobile/android/base/tabspanel/RemoteTabsSetupPanel.java
@@ -11,7 +11,6 @@ import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.activities.FxAccountCreateAccountActivity;
 import org.mozilla.gecko.tabspanel.TabsPanel.PanelView;
-import org.mozilla.gecko.util.HardwareUtils;
 
 import android.content.Context;
 import android.content.Intent;
@@ -69,11 +68,6 @@ class RemoteTabsSetupPanel extends LinearLayout implements PanelView {
 
     @Override
     public void show() {
-        // We don't have a tablet implementation of this panel.
-        if (HardwareUtils.isTablet()) {
-            return;
-        }
-
         setVisibility(View.VISIBLE);
     }
 
diff --git a/mobile/android/base/tabspanel/RemoteTabsVerificationPanel.java b/mobile/android/base/tabspanel/RemoteTabsVerificationPanel.java
index ec5dba9c948d..944177481feb 100644
--- a/mobile/android/base/tabspanel/RemoteTabsVerificationPanel.java
+++ b/mobile/android/base/tabspanel/RemoteTabsVerificationPanel.java
@@ -8,7 +8,6 @@ import org.mozilla.gecko.R;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.login.State;
 import org.mozilla.gecko.tabspanel.TabsPanel.PanelView;
-import org.mozilla.gecko.util.HardwareUtils;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -98,11 +97,6 @@ class RemoteTabsVerificationPanel extends LinearLayout implements PanelView {
 
     @Override
     public void show() {
-        // We don't have a tablet implementation of this panel.
-        if (HardwareUtils.isTablet()) {
-            return;
-        }
-
         refresh();
         setVisibility(View.VISIBLE);
     }