Adam Bookatz 3a58103327 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: bb96e81f34 -s ours am: 1db07ae91a -s ours ...

am skip reason: contains skip directive

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

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

2024-12-03 22:01:15 +00:00

libs

…

protos

Add allowlist mechanism for battery optimization mode

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

res

Import translations. DO NOT MERGE ANYWHERE

2024-11-13 22:43: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

2023-10-02 00:08:36 -07:00

src/com/android/settings

Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev

2024-12-03 19:52:15 +00:00

tests

Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034

2024-11-25 04:04:39 +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

…

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

…

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%