Hyunyoung Song 4703746f50 Update ShortcutManager/Service javadoc/impl around sizing ...

to account for AdaptiveIconDrawable type of shortcuts

Test: builds for now.. If Makoto is happy with this change, will add tests

b/37743074

Change-Id: Ieecd95d621db57f858fac449d3bcedd173c8607c

2017-05-12 11:45:06 -07:00

..

java

Update ShortcutManager/Service javadoc/impl around sizing

2017-05-12 11:45:06 -07:00

jni

Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev

2017-05-11 03:55:40 +00:00

proto/android

add a global control for badging

2017-05-11 17:19:01 -04:00

res

Merge changes from topic 'onarevert' into oc-dev

2017-05-12 04:40:26 +00:00

tests

Merge "Re-Re-enable SettingsBackupTest" into oc-dev

2017-05-12 14:25:05 +00:00