TreeHugger Robot 2f5d56763d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28 -s ours am: 3dd47490aa -s ours am: 75acc4af17 -s ours am: b6268268ac -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: I67ee6b44239ace254e169778bf5ad3e29af6f86e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-08-07 05:37:14 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-08-07 04:51:08 +00:00

src/com/android/settings

Merge "Provide useful hint when invalid SIM PIN is entered during changing SIM PIN"

2022-08-05 20:08:13 +00:00

tests

Merge "Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files)"

2022-08-05 18:34:48 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Enable Kotlin for Settings App

2022-05-30 01:58:25 +08:00

AndroidManifest.xml

Merge "Unify the caption preference class naming"

2022-08-02 22:15:31 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Clean up unused string resource sync_plug

2022-06-01 18:43:10 +08:00

NOTICE

…

OWNERS

Add ykhung to the Settings Owners file

2022-06-24 05:58:57 +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%