Treehugger Robot 1eca5e767d [automerger skipped] Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev am: 29ad4163c2 -s ours ...

am skip reason: Merged-In I2c4d2b7e224973c4afa75573e05afe7607d2ae6b with SHA-1 f4462ac5c2 is already in history

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

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

2024-04-18 18:07:39 +00:00

aconfig

Allow dynamic injecting preference into specific preferenceCategory

2024-04-16 15:30:56 +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 17:45:41 +00:00

res

Merge "feat(onefingerpan): hide the one finger pan settings when window mode only" into main

2024-04-18 03:07:04 +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-15 17:25:54 -07:00

src/com/android/settings

Merge "Update footer text whenever the ScreenPinningSettings is shown" into main

2024-04-18 17:25:17 +00:00

tests

Merge "Update footer text whenever the ScreenPinningSettings is shown" into main

2024-04-18 17:25:17 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Statically inlcude the frameworks flags lib

2024-03-20 15:45:44 +00:00

AndroidManifest.xml

Avoid to reset the data

2024-04-17 08:36:29 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09: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%