diff options
| author | Roman Birg <roman@cyngn.com> | 2016-04-11 16:27:29 -0700 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2016-04-12 08:56:10 -0700 |
| commit | 327acc7a3c5b4a2863e6883eef8a8518f07756f9 (patch) | |
| tree | 9866eebd71c016380d7a19faa42ebdeacb4a2473 /packages | |
| parent | e47b2f510ffea7d392c7e21ad0d1310d73b7f2be (diff) | |
| download | frameworks_base-327acc7a3c5b4a2863e6883eef8a8518f07756f9.zip frameworks_base-327acc7a3c5b4a2863e6883eef8a8518f07756f9.tar.gz frameworks_base-327acc7a3c5b4a2863e6883eef8a8518f07756f9.tar.bz2 | |
SystemUI: fix double tap power launching custom lockscreen icon
Ticket: RM-232
Change-Id: I2ddf9fce55e9deb9cdf70416f0ed2ee5ce6ce225
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 31b8f34..723a042 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -568,7 +568,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL public void launchCamera(String source) { final Intent intent; - if (!mShortcutHelper.isTargetCustom(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT)) { + if (source.equals(CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP) || !mShortcutHelper + .isTargetCustom(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT)) { intent = getCameraIntent(); } else { intent = mShortcutHelper.getIntent(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT); |