commit 08ba9733613a28718cd97aa3e0f9ccd0bf766f3a
author Chiao Cheng <chiaocheng@google.com> Tue Jun 18 00:31:25 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 18 00:31:26 2013 +0000
tree edadc2fbd1e6be74810675634a5a9ef5b7896239
parent 3f28430fb51b466f6e4468760f06379dfd2d28d5
parent e90783822d17ef7696d8ec09ebb3ddd6d1768986

Merge "Fix scrollbar position for RTL."

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 639cc3a..80d5885 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -994,26 +994,31 @@
         mAllFragment.setFilter(mContactListFilterController.getFilter());
 
         final boolean useTwoPane = PhoneCapabilityTester.isUsingTwoPanes(this);
-        final Locale locale = Locale.getDefault();
-        final int layoutDirection = TextUtils.getLayoutDirectionFromLocale(locale);
-        final boolean isLayoutRtl = (layoutDirection == View.LAYOUT_DIRECTION_RTL);
-        final int position;
-        if (useTwoPane)  {
-            position = isLayoutRtl ? View.SCROLLBAR_POSITION_RIGHT : View.SCROLLBAR_POSITION_LEFT;
-        } else {
-            position = isLayoutRtl ? View.SCROLLBAR_POSITION_LEFT: View.SCROLLBAR_POSITION_RIGHT;
-        }
-        mAllFragment.setVerticalScrollbarPosition(position);
+
+        mAllFragment.setVerticalScrollbarPosition(getScrollBarPosition(useTwoPane));
         mAllFragment.setSelectionVisible(useTwoPane);
         mAllFragment.setQuickContactEnabled(!useTwoPane);
     }
 
+    private int getScrollBarPosition(boolean useTwoPane) {
+        final boolean isLayoutRtl = isRTL();
+        final int position;
+        if (useTwoPane) {
+            position = isLayoutRtl ? View.SCROLLBAR_POSITION_RIGHT : View.SCROLLBAR_POSITION_LEFT;
+        } else {
+            position = isLayoutRtl ? View.SCROLLBAR_POSITION_LEFT : View.SCROLLBAR_POSITION_RIGHT;
+        }
+        return position;
+    }
+
+    private boolean isRTL() {
+        final Locale locale = Locale.getDefault();
+        return TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_RTL;
+    }
+
     private void configureGroupListFragment() {
         final boolean useTwoPane = PhoneCapabilityTester.isUsingTwoPanes(this);
-        mGroupsFragment.setVerticalScrollbarPosition(
-                useTwoPane
-                        ? View.SCROLLBAR_POSITION_LEFT
-                        : View.SCROLLBAR_POSITION_RIGHT);
+        mGroupsFragment.setVerticalScrollbarPosition(getScrollBarPosition(useTwoPane));
         mGroupsFragment.setSelectionVisible(useTwoPane);
     }
 

src/com/android/contacts/group/GroupBrowseListFragment.java

diff --git a/src/com/android/contacts/group/GroupBrowseListFragment.java b/src/com/android/contacts/group/GroupBrowseListFragment.java
index d6ca3d7..39313c3 100644
--- a/src/com/android/contacts/group/GroupBrowseListFragment.java
+++ b/src/com/android/contacts/group/GroupBrowseListFragment.java
@@ -148,10 +148,8 @@
     }
 
     public void setVerticalScrollbarPosition(int position) {
-        if (mVerticalScrollbarPosition != position) {
-            mVerticalScrollbarPosition = position;
-            configureVerticalScrollbar();
-        }
+        mVerticalScrollbarPosition = position;
+        configureVerticalScrollbar();
     }
 
     private void configureVerticalScrollbar() {