Treehugger Robot 9cdccef680 [automerger skipped] Merge "Add default Sound Picker package name" into tm-dev am: fa833f8136 am: 0881c66d1d -s ours am: 0a5c1919fe -s ours am: 8e9bb7a08c -s ours am: cbf92c4af0 -s ours ...

am skip reason: Merged-In I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504 with SHA-1 89a32bb7d2 is already in history

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

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

2025-01-10 00:12:13 -08:00

aconfig

Merge "Fix an assumption that UserHandle.myUserId() always returns the main user." into main

2025-01-09 12:37:05 -08: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

Merge "a11y: Initialize slider position with cursor area size setting" into main

2025-01-09 17:58:57 -08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2025-01-02 09:17:11 -08:00

src/com/android/settings

Merge "[Catalyst] Update DataChangeReason usages to PreferenceChangeReason" into main

2025-01-09 23:07:49 -08:00

tests

Merge "[Temp bonding] Block users to select temp bond device as primary device for call in "Call audio" under "Audio sharing" page" into main

2025-01-09 20:51:59 -08:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Allow to open Content Protection settings externally" into main

2025-01-07 00:58:53 -08:00

AndroidManifest.xml

Merge "[Biometric Onboarding & Edu] Update Set up Face Unlock page" into main

2025-01-08 19:29:47 -08:00

CleanSpec.mk

…

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

…

OWNERS

Update OWNERS for Android Settings

2024-11-28 09:15:16 +00:00

PREUPLOAD.cfg

Disable checkcolor hook

2024-11-22 12:59:43 +00: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%