OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b3690cc
ddcdecc
)
Merge changes from topic 'smooth_unlock' into nyc-mr1-dev
author
Adrian Roos
<roosa@google.com>
Fri, 5 Aug 2016 18:37:27 +0000
(18:37 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 5 Aug 2016 18:37:29 +0000
(18:37 +0000)
* changes:
Keyguard: Improve trusted unlock while occluded
Keyguard: Refactoring for improving trusted unlock while occluded
1
2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/policy/PhoneWindowManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
Simple merge
diff --cc
services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
diff --cc
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
Simple merge