Automerger Merge Worker 557344cfe6 Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into udc-qpr-dev-plus-aosp am: 3113c210d6 ...

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

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

2023-10-03 05:49:04 +00:00

aconfig

Add feature flags for Factory Reset Wizard.

2023-09-29 18:17:18 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-10-02 06:53:51 -07: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 07:07:06 -07:00

src/com/android/settings

Merge "Fix notificaiton not working in work profile" into main

2023-10-03 02:11:34 +00:00

tests

Merge "Fix notificaiton not working in work profile" into main

2023-10-03 02:11:34 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Add feature flags for Factory Reset Wizard.

2023-09-29 18:17:18 +00:00

AndroidManifest.xml

Merge "Fix notificaiton not working in work profile" into main

2023-10-03 02:11:34 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00: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

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +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 "Move SettingsUITests to presubmit"

2023-09-26 07:21:01 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%