Hyunyoung Song a45552c090 Merge commit '40f875679387c0f6f908428d0142eacefeda0247' ...

This CL adds git history that is missing in: ag/q/topic:merge_5945220

How was this generated:
$ git merge -s ours 40f8756793

More context:
40f8756793 is Launcher3 SHA from build 5945220

Test: on top of this git history CL, I executed merge and only two files
had merge conflicts BaseIconFactory and QuicksteLauncher.

Change-Id: Ifd9b738aa681202cff09ccfc18c2a2f8a08acbe3

2019-11-19 14:23:57 -08:00

go

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

iconloaderlib

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

proto_overrides

Adding support for derivative apps to safely extend LauncherLog proto

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

protos

Add a "Dismiss" option for predicted apps in Launcher

2019-08-13 23:57:11 +00:00

quickstep

Skip handling input while the user is still locked

2019-10-25 10:27:44 -07:00

res

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

robolectric_tests

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

SecondaryDisplayLauncher

Import translations. DO NOT MERGE

2019-07-26 11:34:59 -07:00

src/com/android/launcher3

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

src_build_config

Removing flag overrides. All flags should be defined as togglable flags instead.

2019-09-12 10:17:14 -07:00

src_plugins

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

src_shortcuts_overrides/com/android/launcher3

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

src_ui_overrides/com/android/launcher3/uioverrides

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

tests

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

.gitignore

FeatureFlag: quick scrub is now quick switch

2018-11-01 17:26:31 -04:00

Android.bp

Moving TestInformationProvider to Launcher3 so that it can be used for

2019-05-23 14:02:33 -07:00

Android.mk

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

AndroidManifest-common.xml

Add READ_DEVICE_CONFIG permission

2019-08-16 10:18:11 -07:00

AndroidManifest.xml

Changing target sdk to Q

2019-05-17 23:19:58 -07:00

build.gradle

Follow frameworks_intermediates change in gradle

2019-03-15 13:39:00 -07:00

CleanSpec.mk

Move Launcher3QuickStep to /product

2019-01-15 10:07:37 +00:00

fill_screens.py

Updating dialtacts to new package.

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

gradle.properties

ub-launcher3-master should track R sdk

2019-09-10 14:34:35 -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

OWNERS

Setup owners for featureflag files

2019-08-28 16:32:59 -07:00

PREUPLOAD.cfg

Add PREUPLOAD.cfg file to enable repo checkstyle hooks

2019-08-06 01:31:17 +00:00

print_db.py

Tweaking print_db script to take grid size directly.

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

proguard.flags

Fixing proguard to not warn about missing class in graphics package.

2018-11-15 13:38:35 -08:00

settings.gradle

Create iconloader library

2018-11-02 14:18:45 -07:00

S

Description

No description provided

658 MiB

Languages

Java 57.2%

Kotlin 42.4%

AIDL 0.3%