Arc Wang 287a6255cd [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours am: 866f356291 -s ours ...

am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

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

2022-12-01 03:39:00 +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 "Use SpaIntent util in Settings."

2022-12-01 00:25:30 +00:00

tests

Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.""

2022-11-30 16:58:45 +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

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

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%