TreeHugger Robot 9e110eb6b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e8a4480b -s ours am: 8dab2de988 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-11-23 20:36:18 +00:00

libs

…

protos

Database restructure: use protobuf to save battery information fields.

2022-11-17 06:06:54 +00:00

res

Merge "Align same wording style with Settings main switch"

2022-11-23 07:50:04 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2022-11-16 05:14:01 -08:00

src/com/android/settings

Merge "Add page id enum for storage settings"

2022-11-23 18:41:16 +00:00

tests

Merge "Fix FingerprintEnrollIntroFragment buttons"

2022-11-23 14:31:09 +00:00

.gitignore

…

Android.bp

Merge "Remove lifecycle-extensions from Settings"

2022-11-17 07:15:00 +00:00

AndroidManifest.xml

Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f am: 6c7910557e

2022-11-22 03:52:37 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Merge "Revert "Add a cursor preference to Accessibility Settings""

2022-10-11 23:00:34 +00:00

NOTICE

…

OWNERS

Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 am: 486c74f4fa

2022-11-15 07:14:53 +00:00

PREUPLOAD.cfg

…

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%