Bill Yi 8b3613a562 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b53e8a13c -s ours ...

am skip reason: subject contains skip directive

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

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

2023-12-27 19:27:06 +00:00

aconfig

Merge "Add Settings switch to disable Game default frame rate" into main

2023-12-20 21:59:42 +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

2023-12-27 18:46:44 +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-12-26 16:28:57 -08:00

src/com/android/settings

Fix title for work and private profiles

2023-12-27 10:43:23 +00:00

tests

Update action log metircs of app optimize mode.

2023-12-27 14:13:25 +08:00

.gitignore

Update .gitignore list

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

Android.bp

Support reset IMS stack in Reset Mobile Network flow

2023-12-22 10:33:46 -06:00

AndroidManifest.xml

Add ResetMobileNetworkSettingsActivity into Settings

2023-12-21 16:37:19 +00:00

CleanSpec.mk

…

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 "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%