Candice Lo 01965cf83a Merge changes I781cdba1,I13e94ce5,Icafa2109 into udc-qpr-dev am: ca7c7a2a50 am: d79430b971 ...

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

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

2023-05-16 09:56:57 +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 "Implement LocaleNotification in Settings"

2023-05-16 03:28:30 +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 changes I781cdba1,I13e94ce5,Icafa2109 into udc-qpr-dev am: ca7c7a2a50 am: d79430b971

2023-05-16 09:56:57 +00:00

tests

Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: fad17f0db9

2023-05-16 06:44:50 +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 "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4

2023-05-10 18:57:21 +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%