changbetty bc5a1115fc [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours am: 276a2f896a -s ours ...

am skip reason: subject contains skip directive

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

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

2022-11-16 05:30:07 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add BatteryHistoricalLogUtil class

2022-11-04 18:09:11 +08:00

res

Merge "Fingerprint Introduction FragmentActivity"

2022-11-16 00:04:49 +00:00

res-product

Move security_settings_sfps_enroll_finish to res-product

2022-11-15 13:11:45 +08:00

src/com/android/settings

Merge "Fix NPE of mDismissListener in Rename Dialog"

2022-11-16 03:26:40 +00:00

tests

Merge "Fingerprint Introduction FragmentActivity"

2022-11-16 00:04:49 +00:00

.gitignore

…

Android.bp

Moving product specific strings to res-product

2022-11-13 01:03:27 +08:00

AndroidManifest.xml

Merge "Fingerprint Introduction FragmentActivity"

2022-11-16 00:04:49 +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%