Bill Yi e4300ace72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e58050c2f5 -s ours am: ba17ea49b6 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-11-14 00:21:20 +00:00

aconfig

Add cancel button to Erase all data (factory reset)

2023-11-10 13:32:00 +08: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 "Revert "Migrate MainSwitchBar in Settings to Material3"" into main

2023-11-13 15:25:16 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-10-19 20:59:36 -07:00

src/com/android/settings

Merge "Tweak the UI display in the IPv6 address" into main

2023-11-13 11:43:13 +00:00

tests

Merge "Fix the robo test case failed" into main

2023-11-13 08:30:22 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main

2023-10-31 18:17:00 +00:00

AndroidManifest.xml

Merge "settings(nfc): Remove NFC beam settings" into main

2023-10-30 17:11:17 +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

Update Settings OWNERS file

2023-10-26 19:54:52 +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

Revert "Move SettingsUITests to presubmit"

2023-09-26 07:21:01 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%