Julia Tuttle 9d6f04ceeb Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: 7034984e19 am: 6770a297b6 ...

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

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

2023-05-17 18:28:36 +00:00

libs

…

protos

Add allowlist mechanism for battery optimization mode

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

res

Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 am: 0277f1676e

2023-05-17 17:05:35 +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-05-09 20:02:44 -07:00

src/com/android/settings

Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 am: 0277f1676e

2023-05-17 17:05:35 +00:00

tests

Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 am: 0277f1676e

2023-05-17 17:05:35 +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 "Update theme for ChannelPanelActivity" into udc-dev am: 9b95a077b9 am: ba347ac106

2023-05-16 13:04:23 +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

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-09 15:18:50 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%