Automerger Merge Worker 25044d1541 Merge changes from topic "am-ddce0a2084cf439abd07712714ce8975" ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 5387a2592d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: abf0fe2412 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: 185e62a7cc -s ours

2023-06-22 08:51:20 +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

[lint] Fix Wrong Resource Type am: 7aaceaa782 am: 68159be3ee

2023-06-21 07:39:11 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb

2023-06-20 07:51:01 +00:00

src/com/android/settings

Merge "Make sure work profile app cant enable notification listener services"

2023-06-21 20:24:09 +00:00

tests

Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: 87f7101866 am: 6df1a755e6

2023-06-21 08:05:18 +00:00

.gitignore

…

Android.bp

Clean up Settings_srcs & Settings_manifest

2023-06-13 02:16:23 +00:00

AndroidManifest.xml

Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa

2023-06-15 07:19:57 +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%