Xin Li d47d22ecaf [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3efb972a55 -s ours ...

am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

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

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

2024-09-07 02:27:57 +00:00

aconfig

Merge "[ConnectedDevicePage] Make bonded bluetooth devices can be found by Settings search" into main

2024-06-11 10:50:04 +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 24Q3 (ab/AP3A.240905.001) to aosp-main-future

2024-08-08 11:41:20 -07: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 "bluetooth: Refactor BT Audio Codec list" into main am: 7c9f1454da

2024-08-28 07:23:17 +00:00

tests

Merge "bluetooth: Refactor BT Audio Codec list" into main am: 7c9f1454da

2024-08-28 07:23:17 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Biometrics Enrollment refactor (7/N)

2024-06-05 18:18:59 +00:00

AndroidManifest.xml

Add missing required permissions for Settings

2024-08-07 07:53:01 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

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

Refine Settings proguard rules

2022-10-06 09:10:38 -07: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%