Grace Cheng 14f209c149 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: 71a57d8cec ...

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

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

2023-06-15 21:41:11 +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 "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda

2023-06-15 06:34:53 +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-13 01:10:34 -07:00

src/com/android/settings

Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 am: c68d307ca8

2023-06-15 13:09:53 +00:00

tests

Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: c14daa817b am: c88e678aa9

2023-06-15 13:11:06 +00:00

.gitignore

…

Android.bp

Update comment for Settings_srcs build target

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

AndroidManifest.xml

[Settings] Add a verification flow for exiting repair mode

2023-06-15 02:14:41 +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

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%