Sunny Goyal eeeeda6a07 [automerger] Fixing duplicate/inconsistent definitions for model and callbacks am: b23980cc0e ...

Change-Id: If7d19d675472b25fa07715932f47d4ff9966d450

2017-08-17 18:06:08 +00:00

go

Merge changes from topic 'am-84f3ec58-93f2-4a21-a27f-6d727311e4dc' into ub-launcher3-master

2017-08-09 15:14:01 +00:00

proto_overrides

Adding support for derivative apps to safely extend LauncherLog proto

2017-07-20 11:47:11 -07:00

protos

Adding support for derivative apps to safely extend LauncherLog proto

2017-07-20 11:47:11 -07:00

res

Import translations. DO NOT MERGE

2017-08-11 14:06:54 -07:00

src/com/android/launcher3

[automerger] Fixing duplicate/inconsistent definitions for model and callbacks am: b23980cc0e

2017-08-17 18:06:08 +00:00

src_config/com/android/launcher3

[DO NOT MERGE] legacy icon treatment / circle detection

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

src_flags/com/android/launcher3/config

Simplifying FeatureFlags by moving common flags to a base class.

2017-07-24 01:03:43 -07:00

tests

Fixing duplicate/inconsistent definitions for model and callbacks

2017-08-17 11:05:56 -07:00

.gitignore

Adding gradle script for Android Studio

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

Android.mk

Adding A feature flag to disable widgets and a corresponding build

2017-07-21 14:10:13 -07:00

AndroidManifest-common.xml

Updating the WallpaperManagerCompatVL to use JobSchedular instead of intent service

2017-06-08 15:39:38 -07:00

AndroidManifest.xml

Change application launcher icons to adaptive icons

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

build.gradle

Adding A feature flag to disable widgets and a corresponding build

2017-07-21 14:10:13 -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

Merge "When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684" into ub-launcher3-dorval

2017-05-19 18:02:19 +00:00

S

Description

No description provided

658 MiB

Languages

Java 57.2%

Kotlin 42.4%

AIDL 0.3%