diff options
| author | Jim Miller <jaggies@google.com> | 2012-09-13 03:22:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-13 03:22:27 -0700 |
| commit | 7ff2cadd345f7b40945dc69380e8e9cc0c34bcc2 (patch) | |
| tree | e53d093e3668dacf440ea1dd2f90d0a692e913f8 | |
| parent | c1bfc347ef2e008147c58768d75aa78c43b907d2 (diff) | |
| parent | dc663fa5df42bd1e175797e8d91c0f1ed0d275de (diff) | |
| download | frameworks_base-7ff2cadd345f7b40945dc69380e8e9cc0c34bcc2.zip frameworks_base-7ff2cadd345f7b40945dc69380e8e9cc0c34bcc2.tar.gz frameworks_base-7ff2cadd345f7b40945dc69380e8e9cc0c34bcc2.tar.bz2 | |
am dc663fa5: am 39de2b0e: Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev
* commit 'dc663fa5df42bd1e175797e8d91c0f1ed0d275de':
Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it
| -rw-r--r-- | core/res/res/layout/keyguard_transport_control_view.xml | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/res/res/layout/keyguard_transport_control_view.xml b/core/res/res/layout/keyguard_transport_control_view.xml index c40aa66..8e76164 100644 --- a/core/res/res/layout/keyguard_transport_control_view.xml +++ b/core/res/res/layout/keyguard_transport_control_view.xml @@ -20,6 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" + android:layerType="hardware" android:id="@+id/keyguard_transport_control"> <!-- FrameLayout used as scrim to show between album art and buttons --> diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index fca7a35..1405260 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -142,10 +142,11 @@ public class KeyguardHostView extends KeyguardViewBase { (KeyguardTransportControlView) findViewById(R.id.keyguard_transport_control); if (mTransportControl != null) { mTransportControl.setKeyguardCallback(new TransportCallback() { + boolean mSticky = false; @Override public void hide() { int page = getWidgetPosition(R.id.keyguard_transport_control); - if (page != -1) { + if (page != -1 && !mSticky) { if (page == mAppWidgetContainer.getCurrentPage()) { // Switch back to clock view if music was showing. mAppWidgetContainer @@ -166,6 +167,8 @@ public class KeyguardHostView extends KeyguardViewBase { mAppWidgetContainer.addView(mTransportControl, getWidgetPosition(R.id.keyguard_status_view) + 1); mTransportControl.setVisibility(View.VISIBLE); + // Once shown, leave it showing + mSticky = true; } } }); |