Bill Yi 6bf41a9eed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bb2cfb90a -s ours am: 2dd7c0e9a6 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-10-17 01:23:45 +00:00

aconfig

Merge "Rename namespace to globalintl" into main

2023-10-13 05:14:33 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Merge changes from topic "le_audio_allowlist" into main

2023-10-14 08:59:51 +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-06 15:42:54 -07:00

src/com/android/settings

Merge "[CDM PS] Fix an NPE when the device is not associated" into main

2023-10-16 17:16:56 +00:00

tests

Merge "Fix AccessibilitySettingsTest" into main

2023-10-16 19:40:03 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Settings for Polite Notifications" into main

2023-10-11 12:04:37 +00:00

AndroidManifest.xml

Fix battery usage database is not clear when time is changed

2023-10-11 17:40:14 +08:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

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

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +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%