Taran Singh 71e3a1fe03 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df am: 73becab672 -s ours am: 92e234f89b -s ours am: 987348c147 -s ours am: c295e375bb -s ours ...

am skip reason: subject contains skip directive

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

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

2023-07-06 22:35:01 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Merge "use L10n-friendly runtime number formatting based on locale" into main

2023-07-06 17:09:25 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Support the about device warning message for tablets

2023-06-28 02:28:34 +00:00

src/com/android/settings

Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7 am: d4f621f613

2023-07-06 20:18:47 +00:00

tests

Merge "use L10n-friendly runtime number formatting based on locale" into main

2023-07-06 17:09:25 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge "Moving FingerprintSettings to Kotlin"

2023-06-29 12:31:22 +00:00

AndroidManifest.xml

Merge "Clean up assist gesture from Settings" into main

2023-07-06 05:42:20 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Owners updates

2023-05-24 07:41:50 +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

Enable presubmit biometrics unit tests

2023-05-11 06:07:08 +00: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%