Adam Bookatz df48f2777d [automerger skipped] Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154 am: 632754a466 -s ours ...

am skip reason: Merged-In If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd with SHA-1 81e5f3730c is already in history

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

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

2022-11-16 18:57:25 +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 "Fingerprint Introduction FragmentActivity"

2022-11-16 00:04:49 +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 "Fix can't access SD card from work profile"

2022-11-16 06:15:05 +00:00

tests

Merge "Fingerprint Introduction FragmentActivity"

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

auto import from //depot/cupcake/@135843

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

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

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%