commit 00db07e1fb0063691cc5b321307ee4d89269e5f8
author Adam Powell <adamp@google.com> Tue Apr 23 14:19:26 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 23 14:19:26 2013 -0700
tree d707b67b2b70f282fc51b57a22ddf754695566b3
parent 8f590dabd4e7d3fa4abfc74c91640690b63fc45a
parent d0b85cc73723726aa78f43dcef2c97cdbaa4ee08

am d0b85cc7: am 5f8406a0: am f9930189: Fix a parallax/view visibility bug in SlidingPaneLayout

* commit 'd0b85cc73723726aa78f43dcef2c97cdbaa4ee08':
  Fix a parallax/view visibility bug in SlidingPaneLayout

v4/java/android/support/v4/widget/SlidingPaneLayout.java

diff --git a/v4/java/android/support/v4/widget/SlidingPaneLayout.java b/v4/java/android/support/v4/widget/SlidingPaneLayout.java
index 335474e..40200bc 100644
--- a/v4/java/android/support/v4/widget/SlidingPaneLayout.java
+++ b/v4/java/android/support/v4/widget/SlidingPaneLayout.java
@@ -346,6 +346,10 @@
     }
 
     void updateObscuredViewsVisibility(View panel) {
+        final int leftBound = getPaddingLeft();
+        final int rightBound = getWidth() - getPaddingRight();
+        final int topBound = getPaddingTop();
+        final int bottomBound = getHeight() - getPaddingBottom();
         final int left;
         final int right;
         final int top;
@@ -367,9 +371,13 @@
                 break;
             }
 
+            final int clampedChildLeft = Math.max(leftBound, child.getLeft());
+            final int clampedChildTop = Math.max(topBound, child.getTop());
+            final int clampedChildRight = Math.min(rightBound, child.getRight());
+            final int clampedChildBottom = Math.min(bottomBound, child.getBottom());
             final int vis;
-            if (child.getLeft() >= left && child.getTop() >= top &&
-                    child.getRight() <= right && child.getBottom() <= bottom) {
+            if (clampedChildLeft >= left && clampedChildTop >= top &&
+                    clampedChildRight <= right && clampedChildBottom <= bottom) {
                 vis = INVISIBLE;
             } else {
                 vis = VISIBLE;