Tom Hsu 9b681c34dd [Panlingual] Fix conflict am: 70fe2d1fdd am: 370840ff0d ...

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

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

2022-05-05 19:18:23 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-19 10:46:06 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-05-05 16:42:15 +00:00

src/com/android/settings

Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857 am: e4ebac3480 am: 844772713f

2022-05-05 14:52:43 +00:00

tests

Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857 am: e4ebac3480 am: 844772713f

2022-05-05 14:52:43 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Merge "Add intent filters for language and wallpaper setting"

2022-05-05 18:35:01 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color lint

2022-04-11 20:40:18 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Remove myself from OWNERS.

2022-03-22 17:29:48 +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-19 17:23:11 +08:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%