TreeHugger Robot 5520882e9c Merge "[Settings] Fix merge confliction" into stage-aosp-master am: 2904ea9410 am: 6dd4a1c56c ...

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

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

2022-11-16 20:01:08 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add BatteryHistoricalLogUtil class

2022-11-04 18:09:11 +08:00

res

Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154

2022-11-16 01:23:04 +00:00

res-product

Move security_settings_sfps_enroll_finish to res-product

2022-11-15 13:11:45 +08:00

src/com/android/settings

Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a am: 1b70bcbdc4

2022-11-16 19:59:31 +00:00

tests

Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a am: 1b70bcbdc4

2022-11-16 19:59:31 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Moving product specific strings to res-product

2022-11-13 01:03:27 +08:00

AndroidManifest.xml

Merge "Fingerprint Introduction FragmentActivity"

2022-11-16 00:04:49 +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%