Bill Yi 5775318d2a [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours ...

am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807 is already in history

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

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

2023-07-12 14:51:57 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:41:13 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-06-22 22:06:04 -07:00

src/com/android/settings

DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df

2023-07-06 20:43:47 +00:00

tests

Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad

2023-06-29 01:42:39 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Added intro lottie for foldable.

2022-11-04 02:57:38 +00:00

AndroidManifest.xml

Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property

2023-02-16 05:30:08 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

NEW Use Mockito 4.6.1 API

2023-01-12 01:35:44 +00:00

NOTICE

…

OWNERS

Owners updates

2023-05-24 07:41:50 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06: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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%