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

..

attrs.xml

Updating widget tray theme

2017-02-09 10:16:22 -08:00

bools.xml

Adding broadcast receiver to handle SESSION_COMMIT broadcast

2017-03-09 10:56:09 -08:00

colors.xml

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

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

config.xml

Smoother folder animation tweaks.

2017-03-23 14:04:55 -07:00

dimens.xml

Add support for system shortcuts in popup container

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

strings.xml

Merge "Add WidgetsAndMore bottom sheet" into ub-launcher3-dorval

2017-03-30 23:21:39 +00:00

styles.xml

Defining HomeScreenElementTheme for elements which appear on top of

2017-02-17 11:37:30 -08:00