t f56188fc49 [automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 98160a777b -s ours am: abaca3ca7f -s ours am: c73c4ea6b2 -s ours am: 3d0ae76e5d -s ours ...

am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

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

2024-10-31 18:47:59 +00:00

aconfig

[Catalyst] Tethering screen migration

2024-10-31 09:25:23 +08:00

libs

Use androidx.window from prebuilt.

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

protos

Fix search for MMS Message

2024-07-30 11:34:24 +08:00

res

Merge "[Catalyst] Migrate Brightness level" into main

2024-10-31 16:11:26 +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-10-29 05:58:44 -07:00

src/com/android/settings

Merge "[Catalyst] Implement datastore for Smooth display" into main

2024-10-31 16:43:32 +00:00

tests

Merge "[Catalyst] Tethering screen migration" into main

2024-10-31 16:00:32 +00:00

.gitignore

Update .gitignore list

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

Android.bp

[Screen off unlock UDFPS] Fingerprint Settings integration 2/2

2024-10-30 02:29:43 +00:00

AndroidManifest.xml

Export Battery usage screen

2024-10-30 19:31:55 +08:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

…

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

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00:00

TEST_MAPPING

Enable VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%