Automerger Merge Worker 4b027e6ebf Merge changes from topic "am-04e1c042090b48509e2682b5fa012fbf" into main ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8499f60001 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb46b1dc9c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 19edd63f45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86a87925f6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edc6ee27c2 -s ours

2024-07-09 20:09:43 +00:00

aconfig

Merge "Add ring indicator for battery level" into main

2024-07-09 08:44:48 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add AppOptimizationModeEventsUtils to save & update app optimization mode expiration events.

2024-06-03 19:42:26 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-07-09 19:32:21 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-07-07 22:53:53 -07:00

src/com/android/settings

Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb am: f7486fc4a5

2024-07-09 17:56:25 +00:00

tests

Merge "Create a new link preference for priority modes entry" into main

2024-07-09 13:17:06 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

[Dev option] Use DesktopModeStatus and ToggleOverride from wm/shell in Settings DesktopModePreferenceController

2024-07-08 16:07:43 +00:00

AndroidManifest.xml

Fix FP enroll page content overlapped by buttons

2024-07-05 02:05:20 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +08:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00:00

TEST_MAPPING

Enable VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%