Automerger Merge Worker 4c43d97d86 Merge changes from topic "am-a85daf5f57ad4c94a8e17cfffed8df36" into udc-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: 1a02d5733e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours am: 90d348eabc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours am: 650273ab86 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours am: 9c4773b9ae -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours am: 7858247c64 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours am: 23022e0835 -s ours

2023-06-06 16:08:08 +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 "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a am: b0df718bae

2023-06-06 07:58:28 +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

Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d

2023-06-06 06:38:00 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09: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%