Treehugger Robot acce6f0f69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-05-10 22:35:21 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Refine optimize page log pattern

2023-05-10 10:11:28 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev

2023-05-10 21:52:58 +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-05-09 20:03:33 -07:00

src/com/android/settings

Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8

2023-05-10 21:28:20 +00:00

tests

Merge "Fix mistake in test" into udc-dev

2023-05-10 15:59:23 +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

Move Note Shortcut from Settings to SystemUI

2023-05-05 14:54:27 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

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%