Robert Luo 42035bcf6f [automerger skipped] Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp am: a2e12619d5 -s ours ...

am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 d7cfa55286 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b1c72d78fb7e5bf14143a0160bc2e6d1007b97e

2020-12-11 11:02:06 +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 "Import translations. DO NOT MERGE ANYWHERE"

2020-12-11 00:29:28 +00:00

src/com/android/settings

Merge "Remove transcoding for apps from Settings."

2020-12-10 07:50:17 +00:00

tests

Merge "Fix failure BatteryInfoTest after string is update"

2020-12-11 02:42:42 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge "Add <uses-library> information." am: 4bb99a788a am: b10b31bcad am: 9ba309779b

2020-12-10 11:53:43 +00:00

AndroidManifest.xml

Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556

2020-12-08 06:28:46 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color lint errors

2020-09-30 16:09:05 +08:00

NOTICE

…

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00: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%