Arc Wang 21fb769f9e [automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours am: 7c1b458844 -s ours am: b7b0658ebd -s ours am: 9a21435d4e -s ours am: 69b16997a7 -s ours ...

am skip reason: skipped by user arcwang

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

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

2022-11-30 11:06:04 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Database restructure: use protobuf to save battery information fields.

2022-11-17 06:06:54 +00:00

res

Merge "Add more details for translators."

2022-11-30 00:40:07 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2022-11-16 05:14:01 -08:00

src/com/android/settings

Merge "Hide remove user option for main user in multi user settings"

2022-11-30 10:29:49 +00:00

tests

Merge "Hide remove user option for main user in multi user settings"

2022-11-30 10:29:49 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge "Remove lifecycle-extensions from Settings"

2022-11-17 07:15:00 +00:00

AndroidManifest.xml

Merge "Rename ACTION_MEMTAG_SETTINGS"

2022-11-30 01:26:43 +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

…

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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%