Howard Chen b174a163f6 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab -s ours am: 04a6b4ebb3 -s ours ...

am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

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

2024-10-24 07:43:05 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Import translations. DO NOT MERGE ANYWHERE

2024-08-19 15:30:13 -07:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8

2023-06-20 07:05:48 +00:00

src/com/android/settings

Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156

2024-10-24 03:51:16 +00:00

tests

[CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81

2024-10-14 22:00:14 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev

2023-06-06 05:49:40 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +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 presubmit biometrics unit tests

2023-05-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%