Hao Dong 556ea75658 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours am: dc418ca7bf -s ours am: 6f3bb938f7 -s ours am: 8c4d5f0575 -s ours am: fd697a8b25 -s ours am: 1f4dbc2c07 -s ours am: 8d9f96e522 -s ours am: 2744527e63 -s ours ...

am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

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

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

2025-01-16 13:39:15 -08:00

aconfig

Merge "a11y: Add aconfig flag for magnification cursor following dialog" into main

2025-01-15 13:45:08 -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 "Align history styling with Settings" into main

2025-01-16 06:02:24 -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-13 18:23:26 -08:00

src/com/android/settings

Merge "Rename SettingsEnableZenModeDialog to EnableDndDialogFragment" into main

2025-01-16 08:39:36 -08:00

tests

Merge "[Catalyst] Keep activity title in sync with PreferenceFragment" into main

2025-01-15 22:33:10 -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

Enhance contrast ratio for factory reset page

2025-01-15 05:57:49 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update color-check-baseline.xml

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

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%