Hugh Chen bca973fed2 [automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c am: b16061d3ad am: b21ad75989 am: 99b1567fc2 -s ours ...

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f3022d5322a7edfc0c3ebd344b1f8beecc19a05

2021-01-07 18:55:51 +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 "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

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

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

2020-12-10 14:40:49 +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%