Bill Yi df703b920b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72eabac183 -s ours am: e461f358c7 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-10-09 22:18:25 +00:00

aconfig

Merge changes from topic "cukie-300248708-hide2gremoval" into main

2023-10-04 20:12:53 +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

Create AppDataUsageCycleController

2023-10-09 16:19:08 +08: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-02 07:07:06 -07:00

src/com/android/settings

Merge "Don't show lottie if font is too big." into main

2023-10-09 17:48:43 +00:00

tests

Merge "Status header not clickable in DataUsageSummary" into main

2023-10-09 10:37:37 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Not repeat zxing-core dependency" into main

2023-10-07 10:39:21 +00:00

AndroidManifest.xml

Merge "Fix notificaiton not working in work profile" into main

2023-10-03 02:11:34 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00: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%