Swap the navigation buttons and notification icons.

  Left: BACK, HOME, RECENT, [MENU], [CLIPBOARD].
  Right: NOTIFICATIONS, PANEL TRIGGER.

Many Bothans participated in usability tests to bring us
this change.

Change-Id: I45a0847226fd6264a3d62c60001e2b906ac15133

8 files changed, 52 insertions, 53 deletions

diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png b/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png
index 5c578022412a..5aed42f0122e 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png b/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png
index a2527b3cdd9c..5aed42f0122e 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_home_default.png b/packages/SystemUI/res/drawable-mdpi/status_bar_home_default.png
index f219dedc85f0..7e8ade56ca33 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_home_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_home_default.png
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_home_pressed.png b/packages/SystemUI/res/drawable-mdpi/status_bar_home_pressed.png
index 9e64fe89024b..7e8ade56ca33 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_home_pressed.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_home_pressed.png
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_recent_default.png b/packages/SystemUI/res/drawable-mdpi/status_bar_recent_default.png
index 4dd8dc72597b..7de67b069a41 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_recent_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_recent_default.png
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_recent_pressed.png b/packages/SystemUI/res/drawable-mdpi/status_bar_recent_pressed.png
index 350a3e9e7655..7de67b069a41 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_recent_pressed.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_recent_pressed.png
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index 8824028f556a..ed52ad5a1987 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -41,13 +41,12 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_toRightOf="@+id/expand"
-            android:layout_toLeftOf="@+id/systemInfo"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:visibility="gone"
             >
 
-            <TextView android:id="@+id/do_not_disturb"
+            <TextView android:id="@+id/clear_all_button"
                 style="?android:attr/textAppearance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -57,10 +56,10 @@
                 android:layout_marginRight="10dip"
                 android:padding="6dip"
                 android:textSize="14sp"
-                android:text="@string/status_bar_do_not_disturb_button"
+                android:text="@string/status_bar_clear_all_button"
                 />
 
-            <TextView android:id="@+id/clear_all_button"
+            <TextView android:id="@+id/do_not_disturb"
                 style="?android:attr/textAppearance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -70,7 +69,7 @@
                 android:layout_marginRight="10dip"
                 android:padding="6dip"
                 android:textSize="14sp"
-                android:text="@string/status_bar_clear_all_button"
+                android:text="@string/status_bar_do_not_disturb_button"
                 />
 
         </LinearLayout>
@@ -79,17 +78,18 @@
             android:id="@+id/notificationIcons"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/expand"
-            android:layout_toLeftOf="@+id/systemInfo"
+            android:layout_toLeftOf="@+id/expand"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             >
-            <view
-                class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"
-                android:id="@+id/icons"
+            <com.android.systemui.statusbar.tablet.InputMethodButton
+                android:id="@+id/imeButton"
                 android:layout_width="wrap_content"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
+                android:layout_height="match_parent"
                 android:layout_marginLeft="8dip"
+                android:src="@drawable/ic_sysbar_ime_default"
+                android:background="@drawable/ic_sysbar_icon_bg"
+                android:visibility="invisible"
                 />
             <view
                 class="com.android.systemui.statusbar.tablet.NotificationIconArea$DraggerView"
@@ -99,14 +99,12 @@
                 android:background="@drawable/sysbar_hidenotification_handle"
                 android:layout_marginLeft="8dip"
                 />
-            <com.android.systemui.statusbar.tablet.InputMethodButton
-                android:id="@+id/imeButton"
+            <view
+                class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"
+                android:id="@+id/icons"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="@*android:dimen/status_bar_icon_size"
                 android:layout_marginLeft="8dip"
-                android:src="@drawable/ic_sysbar_ime_default"
-                android:background="@drawable/ic_sysbar_icon_bg"
-                android:visibility="visible"
                 />
         </com.android.systemui.statusbar.tablet.NotificationIconArea>
 
@@ -115,8 +113,8 @@
             android:id="@+id/ticker"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@+id/systemInfo"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@+id/systemInfo"
             android:paddingLeft="6dip"
             android:gravity="center_vertical"
             android:animateLayoutChanges="true"
@@ -132,39 +130,27 @@
             android:id="@+id/navigationArea"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentLeft="true"
             android:orientation="horizontal"
             >
-            <com.android.systemui.statusbar.tablet.ShirtPocket
-                android:id="@+id/pocket"
-                android:layout_width="71dip"
+
+            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/back"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:background="@drawable/ic_sysbar_icon_bg"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                android:animateLayoutChanges="true"
-                android:clickable="true"
-                android:descendantFocusability="blocksDescendants"
-                android:gravity="center"
-                >
-                <ImageView 
-                    android:id="@+id/pocket_icon"
-                    android:src="@drawable/ic_sysbar_pocket"
-                    android:visibility="invisible"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    />
-            </com.android.systemui.statusbar.tablet.ShirtPocket>
-            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/menu"
+                android:src="@drawable/ic_sysbar_back"
+                android:background="@drawable/ic_sysbar_icon_bg"
+                systemui:keyCode="4"
+                />
+            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/home"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_sysbar_menu"
-                android:background="@drawable/ic_sysbar_icon_bg"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                systemui:keyCode="82"
-                android:visibility="invisible"
+                android:src="@drawable/ic_sysbar_home"
+                android:background="@drawable/ic_sysbar_icon_bg"
+                systemui:keyCode="3"
                 />
             <ImageButton android:id="@+id/recent"
                 android:layout_width="wrap_content"
@@ -174,24 +160,37 @@
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
                 />
-            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/home"
+            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/menu"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                android:src="@drawable/ic_sysbar_home"
+                android:src="@drawable/ic_sysbar_menu"
                 android:background="@drawable/ic_sysbar_icon_bg"
-                systemui:keyCode="3"
+                systemui:keyCode="82"
+                android:visibility="invisible"
                 />
-            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/back"
-                android:layout_width="wrap_content"
+            <com.android.systemui.statusbar.tablet.ShirtPocket
+                android:id="@+id/pocket"
+                android:layout_width="71dip"
                 android:layout_height="match_parent"
+                android:background="@drawable/ic_sysbar_icon_bg"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                android:src="@drawable/ic_sysbar_back"
-                android:background="@drawable/ic_sysbar_icon_bg"
-                systemui:keyCode="4"
-                />
+                android:animateLayoutChanges="true"
+                android:clickable="true"
+                android:descendantFocusability="blocksDescendants"
+                android:gravity="center"
+                >
+                <ImageView 
+                    android:id="@+id/pocket_icon"
+                    android:src="@drawable/ic_sysbar_pocket"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    />
+            </com.android.systemui.statusbar.tablet.ShirtPocket>
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
index 6426e7e975ec..fd65e4d53477 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
@@ -132,7 +132,7 @@ public class TabletStatusBarService extends StatusBarService {
                 WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
                     | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
                 PixelFormat.TRANSLUCENT);
-        lp.gravity = Gravity.BOTTOM | Gravity.LEFT;
+        lp.gravity = Gravity.BOTTOM | Gravity.RIGHT;
         lp.setTitle("NotificationPanel");
         lp.windowAnimations = com.android.internal.R.style.Animation_SlidingCard;