Xin Li d23672a469 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: da7237b2ed -s ours am: 7928abd2b2 -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: I73aebac0d5cffe37153487a0d210ea1b87fa868a

2022-02-14 18:20:54 +00:00

libs

Update new API for checking the embedding status

2022-01-12 15:00:07 +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 "Move Dream OOBE activity to SettingsGoogle"

2022-02-14 15:31:07 +00:00

src/com/android/settings

Merge "Log clicks on the "Show System / Hide System" button in Location Settings recent accesses."

2022-02-14 17:40:30 +00:00

tests

Merge "[Settings] Fix the test fail in robo tests"

2022-02-14 05:26:10 +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 "Move Dream OOBE activity to SettingsGoogle"

2022-02-14 15:31:07 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Add switch preference for Audio Description.

2022-02-09 10:50:28 +01: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%