Chaohui Wang f1d17b00ce [automerger skipped] Use old getSelectableSubscriptionInfoList am: f1b3c2b9c9 -s ours ...

am skip reason: Merged-In I06b6c61304f9e6c9515b5f989294417ac3f82a60 with SHA-1 ec8ce02ba4 is already in history

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

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

2024-06-24 01:34:32 +00:00

aconfig

Merge "Retrieve WifiDppQrGeneratorFragment at runtime." into main

2024-06-19 06:56:42 +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

Move ZenModesBackend to SettingsLib.

2024-06-21 15:19:11 +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-06-13 14:48:04 -07:00

src/com/android/settings

Merge "Move ZenModesBackend to SettingsLib." into main

2024-06-21 16:50:27 +00:00

tests

Merge "Move ZenModesBackend to SettingsLib." into main

2024-06-21 16:50:27 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Migrate Settings intents

2024-06-20 12:48:40 -04:00

AndroidManifest.xml

Migrate Settings intents

2024-06-20 12:48:40 -04: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

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%