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

am 140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev

Browse Source 
* commit '140e3f88fbd176530f89b3f5f4a29b2a77b97bac':
  Fixed a bug where the HUNs were not clickable
This commit is contained in:
Selim Cinek
2014-11-06 16:15:49 +00:00
committed by Android Git Automerger
parent 832607e448 140e3f88fb
commit 8f6719a15d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java
View File

@@ -54,7 +54,6 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
private EdgeSwipeHelper mEdgeSwipeHelper; private EdgeSwipeHelper mEdgeSwipeHelper;
private PhoneStatusBar mBar; private PhoneStatusBar mBar;
private ExpandHelper mExpandHelper;
private long mStartTouchTime; private long mStartTouchTime;
private ViewGroup mContentHolder; private ViewGroup mContentHolder;
@@ -206,7 +205,6 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height); int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height);
int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height); int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height);
mExpandHelper = new ExpandHelper(getContext(), this, minHeight, maxHeight);
mContentHolder = (ViewGroup) findViewById(R.id.content_holder); mContentHolder = (ViewGroup) findViewById(R.id.content_holder);
mContentHolder.setOutlineProvider(CONTENT_HOLDER_OUTLINE_PROVIDER); mContentHolder.setOutlineProvider(CONTENT_HOLDER_OUTLINE_PROVIDER);
@@ -227,7 +225,6 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
} }
return mEdgeSwipeHelper.onInterceptTouchEvent(ev) return mEdgeSwipeHelper.onInterceptTouchEvent(ev)
|| mSwipeHelper.onInterceptTouchEvent(ev) || mSwipeHelper.onInterceptTouchEvent(ev)
|| mExpandHelper.onInterceptTouchEvent(ev)
|| super.onInterceptTouchEvent(ev); || super.onInterceptTouchEvent(ev);
} }
@@ -255,7 +252,6 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
mBar.resetHeadsUpDecayTimer(); mBar.resetHeadsUpDecayTimer();
return mEdgeSwipeHelper.onTouchEvent(ev) return mEdgeSwipeHelper.onTouchEvent(ev)
|| mSwipeHelper.onTouchEvent(ev) || mSwipeHelper.onTouchEvent(ev)
|| mExpandHelper.onTouchEvent(ev)
|| super.onTouchEvent(ev); || super.onTouchEvent(ev);
} }
@@ -400,7 +396,7 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
final float dY = ev.getY() - mFirstY; final float dY = ev.getY() - mFirstY;
final float daX = Math.abs(ev.getX() - mFirstX); final float daX = Math.abs(ev.getX() - mFirstX);
final float daY = Math.abs(dY); final float daY = Math.abs(dY);
if (!mConsuming && (4f * daX) < daY && daY > mTouchSlop) { if (!mConsuming && daX < daY && daY > mTouchSlop) {
if (dY > 0) { if (dY > 0) {
if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found an open"); if (DEBUG_EDGE_SWIPE) Log.d(TAG, "found an open");
mBar.animateExpandNotificationsPanel(); mBar.animateExpandNotificationsPanel();