Bill Yi 798751d4cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e99d19cd85 -s ours ...

am skip reason: contains skip directive

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

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

2024-02-01 13:53:27 +00:00

aconfig

Merge changes I3ae8f945,I126ef66d into main

2024-01-25 05:08:40 +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 "Add Private space Delete settings page inside PS settings page" into main

2024-02-01 10:12:14 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-01-24 21:47:56 -08:00

src/com/android/settings

Merge "Add Private space Delete settings page inside PS settings page" into main

2024-02-01 10:12:14 +00:00

tests

Merge "Add Private space Delete settings page inside PS settings page" into main

2024-02-01 10:12:14 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Add Private space Delete settings page inside PS settings page

2024-01-31 19:29:13 +00:00

AndroidManifest.xml

Add Private space Delete settings page inside PS settings page

2024-01-31 19:29:13 +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

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%