Xin Li c7e0649c2e [automerger skipped] Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future am: 6387b7e6b2 -s ours ...

am skip reason: Merged-In If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0 with SHA-1 40d9abb773 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25973942

Change-Id: Iab2a0d257e1ee92e71cbae270368e48e58637578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2024-01-31 02:08:23 +00:00

aconfig

Merge changes I3ae8f945,I126ef66d into main

2024-01-25 05:08:40 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge "[Audiosharing] UI refinement." into main

2024-01-29 14:11:38 +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-01-24 21:47:56 -08:00

src/com/android/settings

Merge "Publish system update info when updates are in progress" into main am: a6bec4e541 am: 023b52dc4d

2024-01-30 22:52:21 +00:00

tests

Merge "Move the default shortcut types in a separate utility method." into main

2024-01-29 21:15:53 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Add SettingsLintDefaults to Settings-core

2024-01-17 15:02:38 +08:00

AndroidManifest.xml

Forward developer settings intent to primary profile

2024-01-29 10:03:34 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

…

OWNERS

Update Settings OWNERS file

2023-10-26 19:54:52 +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

Revert "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%