OSDN Git Service

Merge changes I09f58bdc,Iaf6cee33 into pi-dev
authorLucas Dupin <dupin@google.com>
Tue, 20 Mar 2018 18:16:02 +0000 (18:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Mar 2018 18:16:02 +0000 (18:16 +0000)
commitb5438ce1059d69b2ebd5be427fcadc60e1fdce7c
tree0f05b76972f9a69c9ffd92a17048434430eca6f1
parent6446ed4a0f551b855474b34d7e6677120af943be
parentd51073055e0ad84137ce387c5cdcc4d7d38e576f
Merge changes I09f58bdc,Iaf6cee33 into pi-dev

* changes:
  Hide SHOW_WHEN_LOCKED activity under scrim
  Temporarily show wallpaper when pulsing
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java