TreeHugger Robot 635accf3ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255 -s ours am: f4cd4b3e68 -s ours am: 26c64d0ffe -s ours am: d2f1595591 -s ours am: 3c2d233b55 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-07-01 02:47:23 +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 "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774 am: 8b6d40e167

2022-06-30 19:49:16 +00:00

src/com/android/settings

Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 0e4e512d7b

2022-06-30 05:37:16 +00:00

tests

Merge "Refactor CaptionPropertiesFragment to improve maintainability"

2022-06-30 03:48:33 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

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

AndroidManifest.xml

Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35

2022-06-22 19:43:37 +00:00

CleanSpec.mk

…

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

…

proguard.flags

Import the window extension libary in the Settings app

2021-08-19 17:23:11 +08:00

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%