Bug 854458 - Use different focus navigation direction on horizontal tabs tray (r=mfinkle)

mobile/android/base/resources/layout/tabs_item_cell.xml

@@ -4,8 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <Gecko.TabRow xmlns:android="http://schemas.android.com/apk/res/android"
+              style="@style/TabsItem"
               android:focusable="true"
-              android:nextFocusRight="@+id/close"
               android:id="@+id/info"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
                       android:duplicateParentState="true"/>
 
             <ImageButton android:id="@+id/close"
-                         android:nextFocusLeft="@+id/info"
+                         style="@style/TabsItemClose"
                          android:layout_width="32dip"
                          android:layout_height="fill_parent"
                          android:background="@drawable/action_bar_button_inverse"

mobile/android/base/resources/layout/tabs_item_row.xml

@@ -4,8 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <Gecko.TabRow xmlns:android="http://schemas.android.com/apk/res/android"
+              style="@style/TabsItem"
               android:focusable="true"
-              android:nextFocusRight="@+id/close"
               android:id="@+id/info"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
               android:duplicateParentState="true"/>
 
     <ImageButton android:id="@+id/close"
-                 android:nextFocusLeft="@+id/info"
+                 style="@style/TabsItemClose"
                  android:layout_width="34dip"
                  android:layout_height="fill_parent"
                  android:background="@drawable/action_bar_button_inverse"

mobile/android/base/resources/values-land/styles.xml

@@ -9,4 +9,12 @@
          <item name="android:orientation">horizontal</item>
     </style>
 
+    <style name="TabsItem">
+         <item name="android:nextFocusDown">@+id/close</item>
+    </style>
+
+    <style name="TabsItemClose">
+         <item name="android:nextFocusUp">@+id/info</item>
+    </style>
+
 </resources>

mobile/android/base/resources/values-large-v11/styles.xml

@@ -60,4 +60,12 @@
          <item name="android:orientation">horizontal</item>
     </style>
 
+    <style name="TabsItem">
+         <item name="android:nextFocusDown">@+id/close</item>
+    </style>
+
+    <style name="TabsItemClose">
+         <item name="android:nextFocusUp">@+id/info</item>
+    </style>
+
 </resources>

mobile/android/base/resources/values/styles.xml

@@ -145,6 +145,14 @@
          <item name="android:orientation">vertical</item>
     </style>
 
+    <style name="TabsItem">
+         <item name="android:nextFocusRight">@+id/close</item>
+    </style>
+
+    <style name="TabsItemClose">
+         <item name="android:nextFocusLeft">@+id/info</item>
+    </style>
+
     <!-- RemoteTabsList -->
     <style name="RemoteTabsList" parent="android:style/Widget.ListView">
          <item name="android:listSelector">@android:color/transparent</item>