Jonathan Miranda b21ee74847 [automerger skipped] resolve merge conflicts of bea8267854 to sc-v2-dev am: 620c7d1854 am: e3d7a5ca0d -s ours ...

am skip reason: Merged-In Ia904b8b96301042c900e0589f33fc625c1c1148b with SHA-1 0750f03c96 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14964089

Change-Id: Iedd44dd301ffe3e43fb88518b0440cf1b4555b55

2021-06-15 02:54:49 +00:00

ext_tests

Leak 2 views for the view leak detection test

2021-05-14 14:06:22 -07:00

go

Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180 am: adb1e11d74

2021-06-14 18:37:04 +00:00

protos

Log widget features.

2021-05-15 00:26:41 +01:00

protos_overrides

[AA+] Log app launches from AA+ search result container.

2021-02-03 10:08:57 -08:00

quickstep

Merge "Address LAUNCHER_APP_LAUNCH_FROM_ICON jank."

2021-06-14 23:29:15 +00:00

res

Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc am: 99600f1598

2021-06-14 23:04:24 +00:00

robolectric_tests

Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c am: e2517121dc

2021-06-08 15:18:20 +00:00

src/com/android/launcher3

Merge "Add flag for widgets in Launcher preview" into sc-v2-dev am: 0058f293eb am: 53d761f63c

2021-06-14 23:55:25 +00:00

src_build_config/com/android/launcher3

Convert Launcher Android.mk to Android.bp to setup RoboTests

2021-03-07 22:42:42 -08:00

src_plugins

Moves BcSmartspaceDataPlugin to SystemUI.

2021-03-12 01:44:19 +00:00

src_shortcuts_overrides/com/android/launcher3/model

Use grid size as the upper bound for widgets' default size in initSpans

2021-06-08 14:15:50 +01:00

src_ui_overrides/com/android/launcher3/uioverrides

Taskbar layout update

2021-06-03 16:10:02 -07:00

tests

Excluding corner radius from quick switch gesture.

2021-06-14 15:05:23 -07:00

tools

Disabling some repo checks for rebolectric files

2020-01-09 09:18:41 -08:00

.gitignore

FeatureFlag: quick scrub is now quick switch

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

Android.bp

Revert "Revert "Update preferences to Material Next styling""

2021-06-11 16:04:35 -04:00

Android.mk

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3

2021-04-27 11:29:17 -07:00

AndroidManifest-common.xml

Revert "Revert "Update preferences to Material Next styling""

2021-06-11 16:04:35 -04:00

AndroidManifest.xml

Handle config changes in Launcher

2021-05-10 18:50:02 +01:00

buglist_unique.txt

Merging from ub-launcher3-master @ build 6925377

2020-10-23 10:16:50 -07:00

buglist_with_title.txt

Merging from ub-launcher3-master @ build 6767682

2020-08-16 12:31:21 -07:00

buglist.txt

Merging from ub-launcher3-master @ build 6925377

2020-10-23 10:16:50 -07:00

build.gradle

[AA+] Log app launches from AA+ search result container.

2021-02-03 10:08:57 -08:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:24:07 +09:00

commitlist.txt

Merging from ub-launcher3-master @ build 6925377

2020-10-23 10:16:50 -07:00

fill_screens.py

Updating dialtacts to new package.

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

gradle.properties

Changes COMPILE_SDK to S.

2020-10-26 17:00:36 -07:00

lint-baseline-common-deps-lib.xml

Add lint baseline to address NewApi errors

2021-04-12 19:36:17 +01:00

lint-baseline-go-res-lib.xml

Add lint baseline to address NewApi errors

2021-04-12 19:36:17 +01:00

lint-baseline-launcher3.xml

Add lint baseline to address NewApi errors

2021-04-12 19:36:17 +01:00

lint-baseline-res-lib.xml

Add lint baseline to address NewApi errors

2021-04-12 19:36:17 +01:00

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Merge "Adding new team members working on the launcher" am: 99d4712ddb am: 1b3d656a39 am: 81283cc8be

2021-04-21 17:53:42 +00:00

PREUPLOAD.cfg

Disabling some repo checks for rebolectric files

2020-01-09 09:18:41 -08:00

proguard.flags

Support launcher animations in new transition system

2021-01-17 21:26:21 -08:00

settings.gradle

Fix gradle build of Launcher3

2020-01-17 11:24:43 -08:00

S

Description

No description provided

658 MiB

Languages

Java 57.2%

Kotlin 42.4%

AIDL 0.3%