Jiaming Liu f97ce8ce5e [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours am: e220a48650 -s ours ...

am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

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

2023-02-24 00:58:56 +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 "Clarify string for translation" into udc-dev am: 6d3a9b40d4

2023-02-23 21:13:58 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Fix b/265364509 Update battery usage page footer string

2023-02-22 15:55:51 +08:00

src/com/android/settings

Merge "Disable MTE developer option if device config overrides it"

2023-02-23 17:57:59 +00:00

tests

Merge "Disable MTE developer option if device config overrides it"

2023-02-23 17:57:59 +00:00

.gitignore

…

Android.bp

Support remote device credentials validation in UI.

2023-02-15 23:23:17 -08:00

AndroidManifest.xml

Merge "Support remote device credentials validation in UI."

2023-02-16 09:42:40 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix checkcolor_hook error

2023-02-10 15:17:22 +08:00

NOTICE

…

OWNERS

Merge "Fixes resource file exemption."

2023-01-30 20:28:12 +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%