Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 94518a4c: Merge "Restore app expectations around drawable visibility change timing" into mnc-dev

Browse Source 
* commit '94518a4c35801fb0b4c0c8bdf2975225fce14d78':
  Restore app expectations around drawable visibility change timing
This commit is contained in:
Adam Powell
2015-05-22 20:04:49 +00:00
committed by Android Git Automerger
parent da517da8d9 94518a4c35
commit 369e607472
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/android/view/View.java
View File

@@ -1766,6 +1766,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* Indicates that we should awaken scroll bars once attached
*
* PLEASE NOTE: This flag is now unused as we now send onVisibilityChanged
* during window attachment and it is no longer needed. Feel free to repurpose it.
*
* @hide
*/
private static final int PFLAG_AWAKEN_SCROLL_BARS_ON_ATTACH = 0x08000000;
@@ -9524,12 +9527,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
protected void onVisibilityChanged(@NonNull View changedView, @Visibility int visibility) {
final boolean visible = visibility == VISIBLE && getVisibility() == VISIBLE;
if (visible) {
if (mAttachInfo != null) {
initialAwakenScrollBars();
} else {
mPrivateFlags |= PFLAG_AWAKEN_SCROLL_BARS_ON_ATTACH;
}
if (visible && mAttachInfo != null) {
initialAwakenScrollBars();
}
final Drawable dr = mBackground;
@@ -10585,9 +10584,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
} else if (mParent != null) {
mParent.invalidateChild(this, null);
}
dispatchVisibilityChanged(this, newVisibility);
notifySubtreeAccessibilityStateChangedIfNeeded();
if (mAttachInfo != null) {
dispatchVisibilityChanged(this, newVisibility);
notifySubtreeAccessibilityStateChangedIfNeeded();
}
}
if ((changed & WILL_NOT_CACHE_DRAWING) != 0) {
@@ -13984,11 +13985,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mParent.requestTransparentRegion(this);
}
if ((mPrivateFlags & PFLAG_AWAKEN_SCROLL_BARS_ON_ATTACH) != 0) {
initialAwakenScrollBars();
mPrivateFlags &= ~PFLAG_AWAKEN_SCROLL_BARS_ON_ATTACH;
}
mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT;
jumpDrawablesToCurrentState();
@@ -14432,6 +14428,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
return mAttachInfo != null ? mAttachInfo.mSession : null;
}
/**
* Return the visibility value of the least visible component passed.
*/
int combineVisibility(int vis1, int vis2) {
// This works because VISIBLE < INVISIBLE < GONE.
return Math.max(vis1, vis2);
}
/**
* @param info the {@link android.view.View.AttachInfo} to associated with
* this view
@@ -14473,6 +14477,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (vis != GONE) {
onWindowVisibilityChanged(vis);
}
// Send onVisibilityChanged directly instead of dispatchVisibilityChanged.
// As all views in the subtree will already receive dispatchAttachedToWindow
// traversing the subtree again here is not desired.
onVisibilityChanged(this, visibility);
if ((mPrivateFlags&PFLAG_DRAWABLE_STATE_DIRTY) != 0) {
// If nobody has evaluated the drawable state yet, then do it now.
refreshDrawableState();

5
core/java/android/view/ViewGroup.java
View File

@@ -2830,12 +2830,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
for (int i = 0; i < count; i++) {
final View child = children[i];
child.dispatchAttachedToWindow(info,
visibility | (child.mViewFlags & VISIBILITY_MASK));
combineVisibility(visibility, child.getVisibility()));
}
final int transientCount = mTransientIndices == null ? 0 : mTransientIndices.size();
for (int i = 0; i < transientCount; ++i) {
View view = mTransientViews.get(i);
view.dispatchAttachedToWindow(info, visibility | (view.mViewFlags & VISIBILITY_MASK));
view.dispatchAttachedToWindow(info,
combineVisibility(visibility, view.getVisibility()));
}
}