Bill Yi d5c30053f5 [automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420 -s ours ...

am skip reason: Change-Id Ia1d85c7136b824e69077ea06c68d142a706c2b11 with SHA-1 62f6b96b51 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I402b212594a9e9f4c118d94008f53177d3430361

2021-02-03 01:34:44 +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

2021-01-29 00:47:28 -08:00

src/com/android/settings

Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3

2021-02-01 18:00:38 +00:00

tests

Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3

2021-02-01 18:00:38 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Revert^2 "Add <uses-library> information."

2020-12-14 22:05:04 +00:00

AndroidManifest.xml

Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 am: b4f375fdc4

2021-01-27 22:24:35 +00: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%