Tom Hsu 140808ff06 [automerger skipped] Fix test failed of SatelliteSettingsPreferenceControllerTest am: 2e6be73789 -s ours ...

am skip reason: Merged-In Icf82dab5a497304df9c3e6a8159e5806ac687445 with SHA-1 48895aaf03 is already in history

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

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

2025-03-20 05:40:28 -07:00

aconfig

Merge "Fixes 'capture more' on Settings home page" into main

2025-03-19 13:05:46 -07: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 "Remove tint color from seekbar" into main

2025-03-20 05:34:37 -07:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2025-03-18 13:51:16 -07:00

src/com/android/settings

Merge "Stay on the region selection page after clicking "Cancel"." into main

2025-03-20 03:32:26 -07:00

tests

Merge "[Audiosharing] Refresh preference when onServiceConnected" into main

2025-03-20 03:14:38 -07:00

.gitignore

Update .gitignore list

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

Android.bp

[Device Supervision] Implement createConfirmSupervisionCredentialsIntent API

2025-03-12 10:34:06 -07:00

AndroidManifest.xml

[Satellite] Move satellite setting related code to a folder

2025-03-13 16:12:16 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

[Expressive design] Add colors for homepage icons

2025-02-26 06:24:47 -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

Explicitly keep default constructor in rules without members

2025-01-08 00:15:31 -08: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%