Meng Wang 2998d4c93f [automerger skipped] When erasing an eSIM, verify the device screen PIN lock if one is set. am: bcf91ee6a7 -s ours ...

am skip reason: Merged-In Iff40c1fb9a2463311768d24d09dfc3aeeee128f9 with SHA-1 1331449353 is already in history

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

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

2024-04-29 22:49:08 +00:00

aconfig

Merge "Add trunk stable flag for slice retirement" into main

2024-04-19 09:57:05 +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 "Import translations. DO NOT MERGE ANYWHERE" into main

2024-04-29 18:54:41 +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-04-28 19:48:11 -07:00

src/com/android/settings

Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f

2024-04-29 22:48:38 +00:00

tests

Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f

2024-04-29 22:48:38 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Fix incorrect password attempts messaging on headless

2024-04-19 12:49:31 +00:00

AndroidManifest.xml

Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 45549d928b

2024-04-29 12:51:08 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +08:00

NOTICE

auto import from //depot/cupcake/@135843

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

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

Enabling private space unit tests in presubmit

2024-03-25 12:38:39 +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%