Xin Li 7928abd2b2 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: da7237b2ed -s ours ...

am skip reason: Merged-In I962c318f41adcf180b885f2052ce0ec4952edfb6 with SHA-1 0eab9c02b9 is already in history

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

Change-Id: I489e0cbc88a0095b34f3b3c260b4a908c764bf55

2022-02-14 18:03:30 +00:00

libs

Sticky placeholder and adjacent finish rule in Settings

2021-11-09 22:32:58 -08:00

packages/apps/Settings/src/com/android/settings/dream

Update OWNERS for dream settings

2022-02-10 19:40:25 +00:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge SQ1A.220205.002

2022-02-07 23:19:53 -08:00

src/com/android/settings

Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c am: 1a16975a36

2022-02-14 11:49:04 +00:00

tests

Merge changes Idadf8487,I84d87024 am: e489d46b7c am: 43b7ae19fb

2022-02-12 12:35:48 +00:00

.gitignore

…

Android.bp

Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a am: 5799ee886b am: 752e7a3ba3

2022-01-27 09:45:15 +00:00

AndroidManifest.xml

Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c am: f3f9477f6e am: 3843e5a957

2021-12-29 20:23:02 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update background color for two-pane mode

2021-12-01 16:39:09 +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

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08: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%