diff options
author | Adam Powell <adamp@google.com> | 2012-11-08 00:28:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 00:28:58 -0800 |
commit | 5dd8b00891faff39ecadb1a0322e14528883bfe3 (patch) | |
tree | f7f334f9331ba3cb205a160d6e6424f33158cc11 | |
parent | a9fa92e889a9dbc94c25e4ba1d67ce24929b834f (diff) | |
parent | efbfa685b678c010342f28ebed1b3b70efae201c (diff) | |
download | base-5dd8b00891faff39ecadb1a0322e14528883bfe3.tar.gz |
Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
4 files changed, 26 insertions, 8 deletions
diff --git a/core/res/res/layout/keyguard_selector_view.xml b/core/res/res/layout/keyguard_selector_view.xml index 7800e8d47646..124bfc929b93 100644 --- a/core/res/res/layout/keyguard_selector_view.xml +++ b/core/res/res/layout/keyguard_selector_view.xml @@ -43,6 +43,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> + <View + android:id="@+id/keyguard_selector_view_frame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:background="@*android:drawable/kg_bouncer_bg_white"/> + <include layout="@layout/keyguard_glow_pad_container" /> <include layout="@layout/keyguard_emergency_carrier_area" diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 86f8665126ca..10a8b1b62229 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1350,6 +1350,7 @@ <java-symbol type="id" name="multi_pane_challenge" /> <java-symbol type="id" name="keyguard_user_selector" /> <java-symbol type="id" name="key_enter" /> + <java-symbol type="id" name="keyguard_selector_view_frame" /> <java-symbol type="integer" name="config_carDockRotation" /> <java-symbol type="integer" name="config_defaultUiModeType" /> <java-symbol type="integer" name="config_deskDockRotation" /> diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java index 062f1ec02957..76cbbd57274e 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java @@ -21,6 +21,7 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.provider.Settings; import android.util.AttributeSet; @@ -45,9 +46,12 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri private GlowPadView mGlowPadView; private ObjectAnimator mAnim; private View mFadeView; + private boolean mIsBouncing; private boolean mCameraDisabled; private boolean mSearchDisabled; private LockPatternUtils mLockPatternUtils; + private SecurityMessageDisplay mSecurityMessageDisplay; + private Drawable mBouncerFrame; OnTriggerListener mOnTriggerListener = new OnTriggerListener() { @@ -80,7 +84,9 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri } public void onReleased(View v, int handle) { - doTransition(mFadeView, 1.0f); + if (!mIsBouncing) { + doTransition(mFadeView, 1.0f); + } } public void onGrabbed(View v, int handle) { @@ -143,6 +149,10 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri mGlowPadView = (GlowPadView) findViewById(R.id.glow_pad_view); mGlowPadView.setOnTriggerListener(mOnTriggerListener); updateTargets(); + + mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); + View bouncerFrameView = findViewById(R.id.keyguard_selector_view_frame); + mBouncerFrame = bouncerFrameView.getBackground(); } public void setCarrierArea(View carrierArea) { @@ -264,9 +274,15 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri @Override public void showBouncer(int duration) { + mIsBouncing = true; + KeyguardSecurityViewHelper. + showBouncer(mSecurityMessageDisplay, mFadeView, mBouncerFrame, duration); } @Override public void hideBouncer(int duration) { + mIsBouncing = false; + KeyguardSecurityViewHelper. + hideBouncer(mSecurityMessageDisplay, mFadeView, mBouncerFrame, duration); } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index 15d06f760f86..073225f90f1e 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -493,13 +493,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout if (mChallengeView != null) { mChallengeView.showBouncer(HANDLE_ANIMATE_DURATION); } - // Mess with padding/margin to inset the bouncer frame. - // We have more space available to us otherwise. - if (mChallengeView != null) { - final LayoutParams lp = (LayoutParams) mChallengeView.getLayoutParams(); - lp.leftMargin = lp.rightMargin = getChallengeMargin(false); - mChallengeView.setLayoutParams(lp); - } if (mBouncerListener != null) { mBouncerListener.onBouncerStateChanged(true); |