Bill Yi d6d007447c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: 201aacead9 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-04-24 22:55:29 +00:00

libs

Use androidx.window from prebuilt.

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

protos

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

2023-02-08 07:48:08 +08:00

res

Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e am: cb1e45b5fc

2023-04-24 07:30:37 +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-18 02:41:31 -07:00

src/com/android/settings

Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d am: e2035d8fa1

2023-04-24 18:50:46 +00:00

tests

Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: ab18cb8bcf

2023-04-23 06:27:05 +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

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

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%