Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev

Author: Fabrice Di Meglio

api/17.txt

@@ -28617,7 +28617,6 @@ package android.widget {
     method public void setHeight(int);
     method public void setHorizontalOffset(int);
     method public void setInputMethodMode(int);
-    method public void setLayoutDirection(int);
     method public void setListSelector(android.graphics.drawable.Drawable);
     method public void setModal(boolean);
     method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener);

api/current.txt

@@ -28619,7 +28619,6 @@ package android.widget {
     method public void setHeight(int);
     method public void setHorizontalOffset(int);
     method public void setInputMethodMode(int);
-    method public void setLayoutDirection(int);
     method public void setListSelector(android.graphics.drawable.Drawable);
     method public void setModal(boolean);
     method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener);

core/java/android/view/ViewRootImpl.java

@@ -1184,6 +1184,7 @@ private void performTraversals() {
             viewVisibilityChanged = false;
             mLastConfiguration.setTo(host.getResources().getConfiguration());
             mLastSystemUiVisibility = mAttachInfo.mSystemUiVisibility;
+            host.setLayoutDirection(mLastConfiguration.getLayoutDirection());
             host.dispatchAttachedToWindow(attachInfo, 0);
             mFitSystemWindowsInsets.set(mAttachInfo.mContentInsets);
             host.fitSystemWindows(mFitSystemWindowsInsets);
@@ -2676,7 +2677,12 @@ void updateConfiguration(Configuration config, boolean force) {
             // the one in them which may be newer.
             config = mView.getResources().getConfiguration();
             if (force || mLastConfiguration.diff(config) != 0) {
+                final int lastLayoutDirection = mLastConfiguration.getLayoutDirection();
+                final int currentLayoutDirection = config.getLayoutDirection();
                 mLastConfiguration.setTo(config);
+                if (lastLayoutDirection != currentLayoutDirection) {
+                    mView.setLayoutDirection(currentLayoutDirection);
+                }
                 mView.dispatchConfigurationChanged(config);
             }
         }

core/java/android/widget/AutoCompleteTextView.java

@@ -1093,7 +1093,6 @@ public void showDropDown() {
             mPopup.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NEEDED);
             mPopup.setListItemExpandMax(EXPAND_MAX);
         }
-        mPopup.setLayoutDirection(getLayoutDirection());
         mPopup.show();
         mPopup.getListView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);
     }

core/java/android/widget/ListPopupWindow.java

@@ -1021,8 +1021,6 @@ public void onNothingSelected(AdapterView<?> parent) {
                 mDropDownList.setOnItemSelectedListener(mItemSelectedListener);
             }
 
-            mDropDownList.setLayoutDirection(mLayoutDirection);
-
             dropDownView = mDropDownList;
 
             View hintView = mPromptView;
@@ -1131,21 +1129,6 @@ public void onNothingSelected(AdapterView<?> parent) {
         return listContent + otherHeights;
     }
 
-    /**
-     * Set the layout direction for this popup. Should be a resolved direction as the
-     * popup as no capacity to do the resolution on his own.
-     *
-     * @param layoutDirection One of {@link View#LAYOUT_DIRECTION_LTR},
-     *   {@link View#LAYOUT_DIRECTION_RTL},
-     *
-     */
-    public void setLayoutDirection(int layoutDirection) {
-        mLayoutDirection = layoutDirection;
-        if (mDropDownList != null) {
-            mDropDownList.setLayoutDirection(mLayoutDirection);
-        }
-    }
-
     /**
      * <p>Wrapper class for a ListView. This wrapper can hijack the focus to
      * make sure the list uses the appropriate drawables and states when

policy/src/com/android/internal/policy/impl/PhoneWindow.java

@@ -2867,8 +2867,6 @@ private void installDecor() {
             mDecor = generateDecor();
             mDecor.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
             mDecor.setIsRootNamespace(true);
-            mDecor.setLayoutDirection(
-                    getContext().getResources().getConfiguration().getLayoutDirection());
             if (!mInvalidatePanelMenuPosted && mInvalidatePanelMenuFeatures != 0) {
                 mDecor.postOnAnimation(mInvalidatePanelMenuRunnable);
             }