Tony Wickham 763c9b2517 Merge changes from topic "am-a154d380-257c-43f3-8484-78ee3a3259b7" into ub-launcher3-master ...

* changes:
  [automerger] Don't crash if getWidth is 0 am: 181968b87b
  Don't crash if getWidth is 0

2018-05-03 20:59:40 +00:00

..

libs

Log OVERVIEW_ACTIVITY via MetricsLogger in quickstep

2018-05-02 14:34:23 -07:00

res

[automerger] Using a custom view instead of ImageView to avoid relayout when the icon changes am: 85c53f2af5

2018-05-02 22:38:26 +00:00

src/com/android

Merge changes from topic "am-a154d380-257c-43f3-8484-78ee3a3259b7" into ub-launcher3-master

2018-05-03 20:59:40 +00:00

AndroidManifest.xml

Fixing Launcher3Quickstep build, broken due to SDK changes

2018-05-02 12:00:53 -07:00