Xin Li 60b92f8e94 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours ...

am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0345dadeff9da4646a382bee8f083233e2c4a55c

2021-03-03 22:28:38 +00:00

libs

Update proto for contextual_card_list.

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

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-12 17:08:01 -08:00

res

Merge "Use string "Carrier settings version"" am: 2161d17f32

2021-02-25 00:10:09 +00:00

src/com/android/settings

Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f

2021-03-03 02:59:37 +00:00

tests

Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087

2021-02-25 08:19:44 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-12 17:08:01 -08:00

AndroidManifest.xml

Merge ab/7061308 into stage.

2021-02-21 09:25:11 -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

auto import from //depot/cupcake/@135843

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

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%