Bill Yi 54f6fc6d11 [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours am: 3f186b6b1c -s ours am: 649fb33ad4 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-05-05 00:43:35 +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:48:08 +08:00

res

Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c

2023-05-04 18:53:30 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev

2023-05-03 20:55:59 +00:00

src/com/android/settings

Use isPrimary bit to determine top provider am: 3096997718

2023-05-04 23:39:14 +00:00

tests

Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5

2023-05-04 15:23:05 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev

2023-04-26 16:08:34 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix empty icon while tapping Auto-rotate screen widget

2023-04-11 17:22:18 +08:00

NOTICE

…

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Add AppStoragePreference for Spa

2022-10-13 17:21:08 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%