Xin Li ccca1eba6c [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: 06b6887d64 -s ours am: bd7e05c797 -s ours ...

am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

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

2022-12-12 13:47:40 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Move fuelgauge_usage_state.proto into fuelgauge folder.

2022-12-02 15:00:58 +08:00

res

Merge "[Settings] Add QR code for EID and enable text copy"

2022-12-12 12:50:51 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2022-11-30 01:31:05 -08:00

src/com/android/settings

Merge "[Settings] Add QR code for EID and enable text copy"

2022-12-12 12:50:51 +00:00

tests

Merge "Don't hide 1% battery usage apps but show percentage "-" instead."

2022-12-12 08:49:22 +00:00

.gitignore

…

Android.bp

Add back resources exported for external usage

2022-12-06 20:57:01 +08:00

AndroidManifest.xml

Add BugReportContentProvider to support new battery usage architecture.

2022-12-02 02:53:13 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Merge "Revert "Add a cursor preference to Accessibility Settings""

2022-10-11 23:00:34 +00:00

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 am: 486c74f4fa

2022-11-15 07:14:53 +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%