diff options
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher2/DragLayer.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index 873803d22..915477119 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -632,6 +632,12 @@ public class DragLayer extends FrameLayout { @Override protected int getChildDrawingOrder(int childCount, int i) { + // We don't want to prioritize the workspace drawing on top of the other children in + // landscape for the overscroll event. + if (LauncherApplication.isScreenLandscape(getContext())) { + return super.getChildDrawingOrder(childCount, i); + } + if (mWorkspaceIndex == -1 || mQsbIndex == -1 || mLauncher.getWorkspace().isDrawingBackgroundGradient()) { return i; diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index e1377fcc2..467cec04c 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3521,11 +3521,13 @@ public class Workspace extends SmoothPagedView mOverscrollFade = fade; float reducedFade = 0.5f + 0.5f * (1 - fade); final ViewGroup parent = (ViewGroup) getParent(); + final ImageView qsbDivider = (ImageView) (parent.findViewById(R.id.qsb_divider)); final ImageView dockDivider = (ImageView) (parent.findViewById(R.id.dock_divider)); final ImageView scrollIndicator = getScrollingIndicator(); cancelScrollingIndicatorAnimations(); - dockDivider.setAlpha(reducedFade); + if (qsbDivider != null) qsbDivider.setAlpha(reducedFade); + if (dockDivider != null) dockDivider.setAlpha(reducedFade); scrollIndicator.setAlpha(1 - fade); } } |