Treehugger Robot baabc09114 [automerger skipped] Merge "Fix the flicker in the Lock screen page" into 24D1-dev am: 6f6629e6cd -s ours ...

am skip reason: Merged-In Icb7714c19ae73d15bccc9b6976a10cf343a16f53 with SHA-1 753a5565cb is already in history

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

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

2024-05-10 03:01:21 +00:00

aconfig

Use system_ext as the container of the aconfig flags in Settings

2024-05-07 02:29:25 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add new action to log battery optimizaition mode updated by Turbo.

2024-05-07 15:02:01 +08:00

res

Merge "[Thread] update Thread settings screen" into main

2024-05-10 02:39:46 +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-05-03 07:08:43 -07:00

src/com/android/settings

Merge "[Thread] update Thread settings screen" into main

2024-05-10 02:39:46 +00:00

tests

Merge "[Thread] update Thread settings screen" into main

2024-05-10 02:39:46 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Fix incorrect password attempts messaging on headless

2024-04-19 12:49:31 +00:00

AndroidManifest.xml

Expose SatelliteWarningDialogActivity

2024-05-09 06:16:34 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +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

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Enabling private space unit tests in presubmit

2024-03-25 12:38:39 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%