OSDN Git Service

Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 5 Apr 2017 20:30:15 +0000 (20:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Apr 2017 20:30:20 +0000 (20:30 +0000)
commitdebabde07357327516d4e576cfdc1abcf444bc35
tree444789bb974cd01292fbfcff1b4b3f86e82365b6
parentb44feb154b3d5a433d3cfeefb1d67ebd8dbcb9b9
parent7c68e29171dca0cb2a914a9c701707d5c562cb03
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev

* changes:
  NotificationViewWrapper: Fix crash for custom views
  Revert "Revert "AOD: Use color filter to invert icons for AOD""
  Revert "Revert "NotificationWrappers: Factor out doze treatment""
  AOD: prevent clicking shelf when dark
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java