Tony ca4e6b4b59 resolve merge conflicts of 26b174659 to ub-launcher3-master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifb24f291b096b979044e5c87ec58c24e9c479728

2017-03-30 18:10:05 -07:00

..

res

Adding support for showing the widget preview based on the provided RemoteViews

2017-03-17 11:25:29 -07:00

src/com/android/launcher3

resolve merge conflicts of 26b174659 to ub-launcher3-master

2017-03-30 18:10:05 -07:00

Android.mk

Adding some widget addition flow tests

2017-01-23 15:28:25 -08:00

AndroidManifest-common.xml

Adding some tests for request pin shortcut/widget flow

2017-02-22 15:46:40 -08:00

AndroidManifest.xml

Adding minSDK for test targets

2017-02-15 10:39:35 -08:00