Xin Li e84fc9380c [automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: e2d326beeb -s ours ...

am skip reason: Merged-In I2489a64804f068a957f9be3f87847d6911b24447 with SHA-1 2871811694 is already in history

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

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

2024-08-12 21:01:24 +00:00

aconfig

Merge "Never restricts Accessibility Activities based on ECM/admin." into main

2024-08-05 22:59:40 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Fix search for MMS Message

2024-07-30 11:34:24 +08:00

res

Reduce the size of individual icons in the icon picker

2024-08-12 18:04:43 +02:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-08-06 17:11:21 -07:00

src/com/android/settings

Merge "Reduce the size of individual icons in the icon picker" into main

2024-08-12 17:16:50 +00:00

tests

Merge "Move rename button next to the device name" into main

2024-08-12 08:18:32 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Show category when search "Mobile data"

2024-07-30 09:48:28 +08:00

AndroidManifest.xml

Add missing required permissions for Settings

2024-08-07 07:53:01 +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%