Don't cause requestLayout when transition changes Visibility.

Bug 21400515

When a Visibility transition temporarily changes a View's
visibility, it should not cause a requestLayout or any other
action, such as focus change. This adds a hidden method to
View to allow it to tweak the visibility without causing
other side-effects.

Change-Id: I5a06149983051319080130e5b5e7cc7edda8dd3e

1 files changed, 3 insertions, 7 deletions

diff --git a/core/java/android/view/GhostView.java b/core/java/android/view/GhostView.java
index 41502b6..d1b96ba 100644
--- a/core/java/android/view/GhostView.java
+++ b/core/java/android/view/GhostView.java
@@ -39,7 +39,7 @@ public class GhostView extends View {
         mView = view;
         mView.mGhostView = this;
         final ViewGroup parent = (ViewGroup) mView.getParent();
-        setGhostedVisibility(View.INVISIBLE);
+        mView.setTransitionVisibility(View.INVISIBLE);
         parent.invalidate();
     }
 
@@ -66,19 +66,15 @@ public class GhostView extends View {
         super.setVisibility(visibility);
         if (mView.mGhostView == this) {
             int inverseVisibility = (visibility == View.VISIBLE) ? View.INVISIBLE : View.VISIBLE;
-            setGhostedVisibility(inverseVisibility);
+            mView.setTransitionVisibility(inverseVisibility);
         }
     }
 
-    private void setGhostedVisibility(int visibility) {
-        mView.mViewFlags = (mView.mViewFlags & ~View.VISIBILITY_MASK) | visibility;
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         if (!mBeingMoved) {
-            setGhostedVisibility(View.VISIBLE);
+            mView.setTransitionVisibility(View.VISIBLE);
             mView.mGhostView = null;
             final ViewGroup parent = (ViewGroup) mView.getParent();
             if (parent != null) {