PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f6a47bbc: Merge "Ensure the intro view is always the top view in the draglayer if it is present" into ub-now-mister-ugly

Browse Source 
* commit 'f6a47bbc05b7797a85034760b001f0050bf439a8':
  Ensure the intro view is always the top view in the draglayer if it is present
This commit is contained in:
Adam Cohen
2014-04-09 18:58:16 +00:00
committed by Android Git Automerger
parent daeeb31ac0 f6a47bbc05
commit 134cb7daca
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DragLayer.java
+18 -5
View File
@@ -122,10 +122,14 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
setInsets(child, mInsets, new Rect());
}
public void showOverlayView(View introScreen) {
public void showOverlayView(View overlayView) {
LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
mOverlayView = introScreen;
addView(introScreen, lp);
mOverlayView = overlayView;
addView(overlayView, lp);
// ensure that the overlay view stays on top. we can't use drawing order for this
// because in API level 16 touch dispatch doesn't respect drawing order.
mOverlayView.bringToFront();
}
public void dismissOverlayView() {
@@ -774,6 +778,11 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
@Override
public void onChildViewAdded(View parent, View child) {
if (mOverlayView != null) {
// ensure that the overlay view stays on top. we can't use drawing order for this
// because in API level 16 touch dispatch doesn't respect drawing order.
mOverlayView.bringToFront();
}
updateChildIndices();
}
@@ -785,6 +794,11 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
@Override
public void bringChildToFront(View child) {
super.bringChildToFront(child);
if (child != mOverlayView && mOverlayView != null) {
// ensure that the overlay view stays on top. we can't use drawing order for this
// because in API level 16 touch dispatch doesn't respect drawing order.
mOverlayView.bringToFront();
}
updateChildIndices();
}
@@ -792,8 +806,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
mTopViewIndex = -1;
int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
if (getChildAt(i) instanceof DragView ||
getChildAt(i) == mOverlayView) {
if (getChildAt(i) instanceof DragView) {
mTopViewIndex = i;
}
}