diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-04-12 13:26:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-12 13:26:29 -0700 |
| commit | 42941218ab96953e84c971d287401176dd809b46 (patch) | |
| tree | 5d419426aea58549d4c056e1ef47d53117b78560 /policy | |
| parent | 80d67ca0b9de1f42736392614885d1cf7f2e8b42 (diff) | |
| parent | f78df28f0376e7e9db6585b69614156c7ee7c6b3 (diff) | |
| download | frameworks_base-42941218ab96953e84c971d287401176dd809b46.zip frameworks_base-42941218ab96953e84c971d287401176dd809b46.tar.gz frameworks_base-42941218ab96953e84c971d287401176dd809b46.tar.bz2 | |
Merge "keyguard: enable magnetic target if no custom targets defined" into cm-10.1
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 52d62fb..283527c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java @@ -316,6 +316,9 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri .ic_lockscreen_camera, !mCameraDisabled); mGlowPadView.setEnableTarget(com.android.internal.R.drawable .ic_action_assist_generic, !mSearchDisabled); + + // Enable magnetic targets + mGlowPadView.setMagneticTargets(true); } else { mStoredTargets = storedVal.split("\\|"); mIsScreenLarge = isScreenLarge(); @@ -326,6 +329,8 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri final boolean isLandscape = mCreationOrientation == Configuration.ORIENTATION_LANDSCAPE; final Drawable blankActiveDrawable = res.getDrawable(R.drawable.ic_lockscreen_target_activated); final InsetDrawable activeBack = new InsetDrawable(blankActiveDrawable, 0, 0, 0, 0); + // Disable magnetic target + mGlowPadView.setMagneticTargets(false); //Magnetic target replacement final Drawable blankInActiveDrawable = res.getDrawable(com.android.internal.R.drawable.ic_lockscreen_lock_pressed); final Drawable unlockActiveDrawable = res.getDrawable(com.android.internal.R.drawable.ic_lockscreen_unlock_activated); |