Xin Li c7c1c6d15b [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours am: b23c8335fb -s ours ...

am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477 is in history

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

Change-Id: Ibe781c52461200cffa1a43174e81a709ff9f2c8b

2020-12-03 04:39:37 +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 "Allow extended apps to change package name"

2020-12-01 21:49:16 +00:00

src/com/android/settings

Merge "Add haptic effect for the seekbar in Settings 5/n."

2020-12-03 02:14:37 +00:00

tests

Merge "Add haptic effect for the seekbar in Settings 4/n."

2020-12-02 12:34:33 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Enable Error Prone to detect obscure bugs.

2020-10-23 14:38:58 -06:00

AndroidManifest.xml

Merge "Initial setup for slot change receiver migration"

2020-12-01 00:57:53 +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

auto import from //depot/cupcake/@135843

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

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

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%