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

..

widget

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

2017-03-17 18:41:31 +00:00

AllAppsAppLaunchTest.java

No more LauncherActivityInfoCompat

2017-01-11 13:06:50 -08:00

AllAppsIconToHomeTest.java

Adding some tests for request pin shortcut/widget flow

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

LauncherInstrumentationTestCase.java

Merge "Adding some tests for request pin shortcut/widget flow" into ub-launcher3-dorval

2017-02-22 23:53:26 +00:00

RotationPreferenceTest.java

Adding some UI tests

2016-05-26 17:20:22 -07:00

ShortcutsLaunchTest.java

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00

ShortcutsToHomeTest.java

Add support for system shortcuts in popup container

2017-03-30 16:35:56 -07:00