Chris Antol 773af8cbe7 [automerger skipped] Merge "Prevent the disabling of specified apps" into main am: d06d6affb4 am: fd72508177 -s ours ...

am skip reason: Merged-In I0b298af76cec20e4f31ec7411bbf3200a2869035 with SHA-1 03bde3d8c6 is already in history

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

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

2024-01-16 19:30:00 +00:00

aconfig

Merge changes from topic "ha-new-pairing" into main

2024-01-16 09:41:37 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge changes from topic "ha-new-pairing" into main

2024-01-16 09:41:37 +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-01-02 14:37:04 -08:00

src/com/android/settings

Merge "[Reskin] Update string of incompatible charging on settings" into main

2024-01-16 16:29:10 +00:00

tests

Merge "[Reskin] Update string of incompatible charging on settings" into main

2024-01-16 16:29:10 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Add a linter requiring Nullability Annotations" into main

2024-01-09 03:47:06 +00:00

AndroidManifest.xml

Clean up the legacy anomaly detection mechanism in the Settings

2024-01-16 04:06:29 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

…

OWNERS

Update Settings OWNERS file

2023-10-26 19:54:52 +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

Revert "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%