Hugh Chen b6e7632fc5 [automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: dc2b694a54 -s ours am: 9d153e6331 -s ours ...

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I509b0b17ff15db95e2a89b7578df24521008d14e

2021-01-07 18:55:14 +00:00

libs

…

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "Move Settings preferenceCategory style into SettingsTheme"

2021-01-07 11:20:37 +00:00

src/com/android/settings

Merge "Only show the schedule text for the night display and dark theme"

2021-01-07 10:30:46 +00:00

tests

Add the mutability flag for SettingsSliceProvider

2021-01-07 16:00:08 +08:00

.gitignore

Create gitignore for Settings

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

Android.bp

Revert "Remove org.apache.http.legacy from Settings"

2021-01-06 05:42:19 +00:00

AndroidManifest.xml

Merge "Revert "Remove org.apache.http.legacy from Settings""

2021-01-06 06:06:47 +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

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

…

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%