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:
6446ed4
d510730
)
Merge changes I09f58bdc,Iaf6cee33 into pi-dev
author
Lucas Dupin
<dupin@google.com>
Tue, 20 Mar 2018 18:16:02 +0000
(18:16 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 20 Mar 2018 18:16:02 +0000
(18:16 +0000)
* changes:
Hide SHOW_WHEN_LOCKED activity under scrim
Temporarily show wallpaper when pulsing
1
2
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge