Xin Li 8ef1a9a1be [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours ...

am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history

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

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

2023-03-15 00:06:07 +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 "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191

2023-03-14 22:39:31 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Update incompatible charging string for different product

2023-03-14 00:49:08 +08:00

src/com/android/settings

Merge "Merge credential manager providers by package name" into udc-dev

2023-03-14 22:55:34 +00:00

tests

Merge "Merge credential manager providers by package name" into udc-dev

2023-03-14 22:55:34 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Support remote device credentials validation in UI.

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

AndroidManifest.xml

Add configChanges for PowerUsageSummaryActivity for rotation

2023-03-09 15:22:12 +08:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Fix failing checkcolor_hook in Settings

2023-03-08 13:35:00 +00:00

NOTICE

auto import from //depot/cupcake/@135843

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

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

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%