Automerger Merge Worker 83b8457007 Merge changes from topic "am-d189c8055d594afdaac0c37f319a8b46" into main ...

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours am: ef431049c9 -s ours am: 6b1a169820 -s ours am: ba718477ea -s ours am: 81279b4c74 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -s ours am: 4c6c18ae10 -s ours am: 517e6edc93 -s ours am: e978c2c6cc -s ours

2023-07-07 03:14:19 +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

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%