OSDN Git Service

Merge "Fixed a bug where the shelf was clickable outside of keyguard"
authorSelim Cinek <cinek@google.com>
Tue, 20 Dec 2016 16:24:03 +0000 (16:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Dec 2016 16:24:07 +0000 (16:24 +0000)
commit23e117a50e3af9c3b8abadbd8a0395da4caba58d
tree3cae1db49522c4720eb630404e752bf2334acefd
parentcbe76a0f1e83f74648ea24a9e8bd4814f9d87c8c
parent810bcde1821b1e53adea645958dbc9fccf498a75
Merge "Fixed a bug where the shelf was clickable outside of keyguard"
packages/SystemUI/res/values/strings.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java