Grace Cheng ab1b393412 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours ...

am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

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

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

2023-06-28 19:03:42 +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 "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev

2023-06-27 14:14:58 +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-06-23 06:45:01 -07:00

src/com/android/settings

Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9

2023-06-28 18:39:16 +00:00

tests

Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9

2023-06-28 18:39:16 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Update comment for Settings_srcs build target

2023-05-31 14:02:01 +08:00

AndroidManifest.xml

Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev

2023-06-27 08:46:50 +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

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-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%