Tom Hsu 2625ca4e7d Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e50 am: bca026c182 ...

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

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

2024-03-25 07:14:10 +00:00

aconfig

Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main

2024-03-18 08:21:57 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 16:54:41 +00:00

res

Merge "[PairDevicePage] Add content description so that the loading icon will be announced." into main

2024-03-25 05:36:34 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-03-21 21:12:36 -07:00

src/com/android/settings

Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e50 am: bca026c182

2024-03-25 07:14:10 +00:00

tests

Merge "To gray out the next button if the user does not select two sim" into main

2024-03-25 03:15:08 +00:00

.gitignore

Update .gitignore list

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

Android.bp

[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage

2024-03-03 22:42:00 +08:00

AndroidManifest.xml

Merge "Disable PS entry point and Activity when PS is not allowed." into main

2024-03-24 14:45:32 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +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 Safety Center & Security unit tests on presubmit.

2024-02-08 16:08:40 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%