Bill Yi 56f5e53ae8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 913dde2150 -s ours am: ed786b4fc6 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-11-11 04:57:08 +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 "Import translations. DO NOT MERGE ANYWHERE" into main

2023-11-10 21:15:40 +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 "Support Private profile in profile modal selector" into main

2023-11-10 20:07:19 +00:00

tests

Merge "Add the dialog when clicking on the diabled switch." into main

2023-11-10 19:13:13 +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

…

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00: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%