diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/ExpandHelper.java | 8 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/FakeShadowView.java | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index d12ab293ab3e..cecbfcb236ba 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -317,8 +317,8 @@ public class ExpandHelper implements Gefingerpoken { mResizedView = null; mWatchingForPull = false; } - mInitialTouchY = ev.getY(); - mInitialTouchX = ev.getX(); + mInitialTouchY = ev.getRawY(); + mInitialTouchX = ev.getRawX(); break; case MotionEvent.ACTION_CANCEL: @@ -412,8 +412,8 @@ public class ExpandHelper implements Gefingerpoken { mWatchingForPull = mScrollAdapter != null && isInside(mScrollAdapter.getHostView(), x, y); mResizedView = findView(x, y); - mInitialTouchX = ev.getX(); - mInitialTouchY = ev.getY(); + mInitialTouchX = ev.getRawX(); + mInitialTouchY = ev.getRawY(); break; case MotionEvent.ACTION_MOVE: { if (mWatchingForPull) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/FakeShadowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/FakeShadowView.java index 32c26ba8ba13..0c1891e1fde9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/FakeShadowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/FakeShadowView.java @@ -25,6 +25,7 @@ import android.view.ViewGroup; import android.view.ViewOutlineProvider; import android.widget.LinearLayout; +import com.android.systemui.R; import com.android.systemui.statusbar.AlphaOptimizedFrameLayout; /** @@ -32,6 +33,7 @@ import com.android.systemui.statusbar.AlphaOptimizedFrameLayout; */ public class FakeShadowView extends AlphaOptimizedFrameLayout { public static final float SHADOW_SIBLING_TRESHOLD = 0.1f; + private final int mShadowMinHeight; private View mFakeShadow; private float mOutlineAlpha; @@ -64,6 +66,8 @@ public class FakeShadowView extends AlphaOptimizedFrameLayout { } }); addView(mFakeShadow); + mShadowMinHeight = Math.max(1, context.getResources() + .getDimensionPixelSize(R.dimen.notification_divider_height)); } public void setFakeShadowTranslationZ(float fakeShadowTranslationZ, float outlineAlpha, @@ -72,6 +76,7 @@ public class FakeShadowView extends AlphaOptimizedFrameLayout { mFakeShadow.setVisibility(INVISIBLE); } else { mFakeShadow.setVisibility(VISIBLE); + fakeShadowTranslationZ = Math.max(mShadowMinHeight, fakeShadowTranslationZ); mFakeShadow.setTranslationZ(fakeShadowTranslationZ); mFakeShadow.setTranslationX(outlineTranslation); mFakeShadow.setTranslationY(shadowYEnd - mFakeShadow.getHeight()); |