George Chang 5004b19a2d [automerger skipped] Revert "settings(dev): Remove NFC stack logging control" am: b5d57eaa58 -s ours ...

am skip reason: Merged-In I3c6026e230c7d35f04d9771442fadbf040a84b94 with SHA-1 a5bd1cf34f is already in history

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

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

2024-03-19 05:25:20 +00:00

aconfig

Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main

2024-03-18 08:21:57 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 17:45:41 +00:00

res

Merge "Add strings for System split" into main

2024-03-18 15:06:55 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-03-14 16:20:00 -07:00

src/com/android/settings

Merge "Make QS shortcut type as default preferred shortcut for A11yService that associate with a TileService" into main

2024-03-18 17:20:43 +00:00

tests

Merge "[ConnectedDevicePage] Add setup to fix testing fail." into main

2024-03-19 05:05:40 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage

2024-03-03 22:42:00 +08:00

AndroidManifest.xml

Enable android:restoreAnyVersion

2024-03-08 16:41:56 +08:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +08:00

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +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

Enable Safety Center & Security unit tests on presubmit.

2024-02-08 16:08:40 +00: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%