Automerger Merge Worker e64b222833 Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp am: ed4143dc5b ...

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

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

2023-06-06 15:18:34 +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

Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a

2023-06-06 07:16:22 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: c3d6820ffd

2023-05-03 20:20:21 +00:00

src/com/android/settings

Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58

2023-06-05 19:25:12 +00:00

tests

Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51

2023-06-02 22:21:34 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

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 am: 185244f43d

2023-06-06 06:38:00 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09: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

Owners updates

2023-05-24 07:41:50 +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%