OSDN Git Service

Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev
authorSelim Cinek <cinek@google.com>
Fri, 11 Mar 2016 02:20:14 +0000 (02:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2016 02:20:15 +0000 (02:20 +0000)
commit00e61f5a6455ba0ae90859acdd76e54efc849c3c
treeaeb4fae90ffd9a65a40c48309ff184fb0b6a8d1c
parent756ac8e0737499c638cdf7979435eae7fd4c48a5
parent2268bcf00645f2aa8df1cb15e6a6c4097e9b9454
Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev

* changes:
  Fixed a bug where text would still not animate
  Reseting user expansions when the shade is collapsed
  Added more spacing around notifications
  Fixed an bug with the notification backgrounds
core/java/android/app/Notification.java
core/res/res/values/symbols.xml
packages/SystemUI/res/values/dimens.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java