Lawnchair

T

Mark Salyzyn 7a8295e0d6 resolve merge conflicts of 311ec8962 to master

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

2017-05-11 07:56:50 -07:00

protos

Launcher dump proto that will be used for:

2017-04-04 23:06:30 +00:00

res

merged ub-launcher3-dorval, and resolved conflicts

2017-05-10 16:52:47 -07:00

src/com/android/launcher3

merged ub-launcher3-dorval, and resolved conflicts

2017-05-10 16:52:47 -07:00

src_config/com/android/launcher3/config

[DO NOT MERGE] legacy icon treatment / circle detection

2017-04-16 21:57:58 -07:00

tests

merged ub-launcher3-dorval, and resolved conflicts

2017-05-10 16:52:47 -07:00

.gitignore

Adding gradle script for Android Studio

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

Android.mk

Using java_style enum generation for proto

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

AndroidManifest-common.xml

Add meta data to indicate launcher_dump provider name

2017-05-04 17:20:20 -07:00

AndroidManifest.xml

Change application launcher icons to adaptive icons

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

build.gradle

Updating gradle and build tools version

2017-04-13 11:25:07 -07: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