Treehugger Robot a4ef2cdfcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: ee690ca0eb -s ours ...

am skip reason: subject contains skip directive

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

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

2023-04-25 17:43:53 +00:00

libs

…

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:41:13 +00:00

res

Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 5e53a4aa56

2023-04-25 16:36:48 +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-04-21 20:13:56 -07:00

src/com/android/settings

Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 5e53a4aa56

2023-04-25 16:36:48 +00:00

tests

Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c am: b168628c13

2023-04-25 15:18:40 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev

2023-04-24 14:07:52 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix empty icon while tapping Auto-rotate screen widget

2023-04-11 17:22:18 +08:00

NOTICE

…

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +00:00

PREUPLOAD.cfg

…

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Add AppStoragePreference for Spa

2022-10-13 17:21:08 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%