Bill Yi ba23ac8a6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e9cfebc93 -s ours am: 23a484796f -s ours ...

am skip reason: subject contains skip directive

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

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

2023-12-15 19:24:07 +00:00

aconfig

Merge "Convert a11y shortcut edit screen to a full screen." into main

2023-12-14 22:19:08 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge "Fix RTL issue on the edit a11y shortcuts screen." into main

2023-12-15 18:50:04 +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-12-13 16:20:20 -08:00

src/com/android/settings

Merge "Add intent to start Private Space setup/settings" into main

2023-12-15 16:38:18 +00:00

tests

Merge "Fix PinPrivacyPreferenceControllerTest" into main

2023-12-15 12:48:11 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Re-enable nullaway plugin

2023-11-30 21:36:24 +08:00

AndroidManifest.xml

Merge "Add intent to start Private Space setup/settings" into main

2023-12-15 16:38:18 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Update Settings OWNERS file

2023-10-26 19:54:52 +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 "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%