Treehugger Robot 98ae913b64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a -s ours am: 891c3ab05a -s ours am: 1539b81ad4 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-12-04 20:04:42 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Database restructure: use protobuf to save battery information fields.

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

res

Merge "Clean up some UnusedResources detected by lint 8"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2022-11-30 01:31:05 -08:00

src/com/android/settings

Merge "Add AlarmsAndRemindersAppListProvider to SpecialAppAccess"

2022-12-02 09:08:07 +00:00

tests

Merge "Revert "Move the auto data switch preference into DDS sim""

2022-12-02 06:41:39 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Merge "Remove lifecycle-extensions from Settings"

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

AndroidManifest.xml

Add BugReportContentProvider to support new battery usage architecture.

2022-12-02 02:53:13 +00:00

CleanSpec.mk

Move the app to /system_ext

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

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

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

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%