Xin Li 478b4df6b2 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours ...

am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: Ia6ce3e6ce68c37c0cbcf0d31aa44c43e59cc4fd7

2020-06-08 16:29:19 +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

Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac

2020-06-08 05:55:47 +00:00

src/com/android/settings

Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15

2020-06-08 06:45:20 +00:00

tests

Merge "Add a new method to set state description" into rvc-d1-dev am: 7d31298291

2020-06-08 05:31:25 +00: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:30:47 +00:00

AndroidManifest.xml

Add entry point for conversation settings

2020-06-02 12:59:13 -04:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update the lint color check file.

2020-01-08 19:16:00 +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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%