Xin Li ee06524dbe [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours ...

am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2389a3b1ff505dc0a8cc84b1d9b21dd7f6c01b

2020-12-10 03:05:02 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Import translations. DO NOT MERGE ANYWHERE

2020-12-05 16:49:34 -08:00

src/com/android/settings

DO NOT MERGE - Merge RQ1A.201205.011

2020-12-07 00:39:43 -08:00

tests

DO NOT MERGE - Merge RQ1A.201205.011

2020-12-07 00:39:43 -08:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Do not exlicitly declare dependency on changeid processor.

2020-03-28 16:34:10 +00:00

AndroidManifest.xml

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

2020-12-02 00:29:15 -08:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Workaround for Recent app icon disappear

2020-06-16 17:30:32 +08:00

NOTICE

…

OWNERS

Update the OWNER files

2020-03-11 16:45:14 +08:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +08:00

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +00:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%