diff options
author | Chris Wren <cwren@android.com> | 2013-08-08 15:55:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-08 15:55:13 -0700 |
commit | 457d901b13aebbf9b99a7724a6ac6894ea31ee19 (patch) | |
tree | d50a73fdd4c74076fc30dcc067ad7d99b52db73e /packages/SystemUI | |
parent | 944e41fe32ea863b61cab0f8002a86f6e5a0412b (diff) | |
parent | bb8b602b7826e7e819beee673a836629d78c3cbb (diff) | |
download | frameworks_base-457d901b13aebbf9b99a7724a6ac6894ea31ee19.zip frameworks_base-457d901b13aebbf9b99a7724a6ac6894ea31ee19.tar.gz frameworks_base-457d901b13aebbf9b99a7724a6ac6894ea31ee19.tar.bz2 |
am bb8b602b: Merge "ensure heads up slider is initialized."
* commit 'bb8b602b7826e7e819beee673a836629d78c3cbb':
ensure heads up slider is initialized.
Diffstat (limited to 'packages/SystemUI')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java index 4920ba5..da90fd1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java @@ -83,6 +83,7 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper. mContentHolder.setAlpha(1f); mContentHolder.removeAllViews(); mContentHolder.addView(mHeadsUp.row); + mSwipeHelper.snapChild(mContentSlider, 1f); mStartTouchTime = System.currentTimeMillis() + mTouchSensitivityDelay; return true; } @@ -231,6 +232,6 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper. @Override public View getChildContentView(View v) { - return v; + return mContentSlider; } }
\ No newline at end of file |