Treehugger Robot 0513b47fdd [automerger skipped] Merge changes Idadf8487,I84d87024 am: e489d46b7c am: 43b7ae19fb am: a93434b11e -s ours ...

am skip reason: Merged-In Idadf84873c88155382c48bb9108cf28d88aaef0a with SHA-1 4a5c128624 is already in history

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

Change-Id: I66d9d54d41213e6409d5cd5fef1025c199674e6e

2022-02-12 12:53:22 +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 "Polish humanize strings for Caption preferences page"

2022-02-11 22:10:14 +00:00

src/com/android/settings

Merge "New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (16/n)."

2022-02-12 03:27:06 +00:00

tests

Merge "Polish humanize strings for Caption preferences page"

2022-02-11 22:10:14 +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 "New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (16/n)."

2022-02-12 03:27:06 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Add switch preference for Audio Description.

2022-02-09 10:50:28 +01:00

NOTICE

…

OWNERS

…

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

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%