Henri Chataing 2b70be5485 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours ...

am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

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

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

2023-02-23 20:33:25 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:48:08 +08:00

res

Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev

2023-02-22 15:06:44 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Fix b/265364509 Update battery usage page footer string

2023-02-22 15:55:51 +08:00

src/com/android/settings

Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2

2023-02-22 18:48:37 +00:00

tests

Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev

2023-02-22 18:03:04 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Support remote device credentials validation in UI.

2023-02-15 23:23:17 -08:00

AndroidManifest.xml

Merge "Support remote device credentials validation in UI."

2023-02-16 09:42:40 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Fix checkcolor_hook error

2023-02-10 15:17:22 +08:00

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Merge "Fixes resource file exemption."

2023-01-30 20:28:12 +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%