Bill Yi c71365c83b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ca22c2264 -s ours ...

am skip reason: contains skip directive

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

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

2024-02-09 00:40:58 +00:00

aconfig

Merge "Use a separated flag for archiving feature in Settings" into main

2024-02-05 10:55:37 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-02-08 20:56:31 +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-01-24 21:47:56 -08:00

src/com/android/settings

Merge "Click the 'convert to eSIM' menu to finish the pSIM setting" into main

2024-02-08 17:27:49 +00:00

tests

Merge "Enable Safety Center & Security unit tests on presubmit." into main

2024-02-08 18:06:32 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Add Private space Delete settings page inside PS settings page

2024-01-31 19:29:13 +00:00

AndroidManifest.xml

Merge "[ECM] Declare MANAGE_ENHANCED_CONFIRMATION_STATES permission (Settings)" into main

2024-02-08 22:22:46 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +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%