Automerger Merge Worker 957d5dcce7 Merge changes from topic "am-83fb4ab6e7314229b5ecf602fd7d3290" into udc-qpr-dev-plus-aosp ...

* changes:
  Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours" into udc-dev-plus-aosp am: df0a3a6534 -s ours am: 3777d18917 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours am: 9789ce21f5 -s ours am: 4ee9a3b7f0 -s ours

2023-06-05 21:50:29 +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 custom action key icon" into udc-qpr-dev am: dbec7ba7fb

2023-06-05 18:03:19 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-05-29 05:31:30 -07:00

src/com/android/settings

Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda

2023-06-05 19:49:39 +00:00

tests

Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb

2023-06-05 18:03:19 +00:00

.gitignore

…

Android.bp

Update comment for Settings_srcs build target

2023-05-31 14:02:01 +08:00

AndroidManifest.xml

One more fix for missing Activity embedding allowlisting for Assistant.

2023-06-01 16:30:51 +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%