Lawnchair

Go to file

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

protos

Merge "Adding logging for various interaction in PinItemRequest UI" into ub-launcher3-dorval

2017-03-30 19:02:25 +00:00

res

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

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

src/com/android/launcher3

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

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

src_config/com/android/launcher3

Separating the config and flags in different directories so that

2017-03-07 09:30:51 -08:00

src_flags/com/android/launcher3/config

Enable feature flag for: Setting soft input to adjust resize while

2017-03-28 11:45:55 -07:00

tests

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

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

.gitignore

Adding gradle script for Android Studio

2015-08-30 21:04:44 -07:00

Android.mk

Separating the config and flags in different directories so that

2017-03-07 09:30:51 -08:00

AndroidManifest-common.xml

Adding broadcast receiver to handle SESSION_COMMIT broadcast

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

AndroidManifest.xml

Change application launcher icons to adaptive icons

2017-03-03 12:48:05 -08:00

build.gradle

Separating the config and flags in different directories so that

2017-03-07 09:30:51 -08:00

CleanSpec.mk

Revert "Revert "Move wallpaper picker code to a separate directory""

2013-12-11 15:41:28 +01:00

fill_screens.py

Updating dialtacts to new package.

2012-08-21 13:35:10 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:27 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:27 -08:00

print_db.py

Tweaking print_db script to take grid size directly.

2015-09-14 11:51:41 -07:00

proguard.flags

Using java_style enum generation for proto

2016-12-15 09:30:35 -08:00