Merge "Navbar : Reverse order in landscape" into cm-10.1

1 files changed, 2 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavbarEditor.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavbarEditor.java
index 9de38ad..8704522 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavbarEditor.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavbarEditor.java
@@ -283,7 +283,7 @@ public class NavbarEditor implements View.OnTouchListener {
     protected void saveKeys() {
         ButtonInfo[] buttons = new ButtonInfo[NavigationButtons.SLOT_COUNT];
         for (int i = 0; i < NavigationButtons.SLOT_COUNT; i++) {
-            int idIndex = mVertical ? NavigationButtons.SLOT_COUNT - i : i;
+            int idIndex = mVertical ? NavigationButtons.SLOT_COUNT - i - 1 : i;
             buttons[i] = (ButtonInfo) mButtonViews.get(idIndex).getTag();
         }
         NavigationButtons.storeButtonMap(mContext, buttons);
@@ -299,7 +299,7 @@ public class NavbarEditor implements View.OnTouchListener {
 
         for (int i = 0; i < buttons.length; i++) {
             int id = BUTTON_IDS[i];
-            ButtonInfo info = buttons[i];
+            ButtonInfo info = buttons[mVertical ? buttons.length - i - 1 : i];
             KeyButtonView button = (KeyButtonView) mParent.findViewById(id);
             boolean isSmallButton = NavigationButtons.IS_SLOT_SMALL[i];