SongFerng Wang b8388cd90f Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main am: 9dc07f4e19 am: 4fec2b9e47 ...

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

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

2025-02-12 19:42:39 -08:00

aconfig

Merge "[Catalyst] Create new flag for migrating Vibration & haptics page" into main

2025-02-11 18:31:38 -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 "[Settings] Apply new style to dialog" into main

2025-02-12 17:28:45 -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-02-10 13:04:43 -08:00

src/com/android/settings

Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main am: 9dc07f4e19 am: 4fec2b9e47

2025-02-12 19:42:39 -08:00

tests

Merge "[Settings] Apply new style to dialog" into main

2025-02-12 17:28:45 -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

[Catalyst] Enforce WRITE_SYSTEM_PREFERENCES permission

2025-02-06 18:03:58 +08: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

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%