Hansen Kurli c58030dcb0 Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 3a33f7178f ...

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

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

2023-11-13 06:52:32 +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-30 19:20:39 -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-19 21:00:32 -07:00

src/com/android/settings

Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 3a33f7178f

2023-11-13 06:52:32 +00:00

tests

Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: e808116b30

2023-11-08 20:18:08 +00:00

.gitignore

…

Android.bp

Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75

2023-11-07 04:48:36 +00:00

AndroidManifest.xml

Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148

2023-10-30 21:03:30 +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

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

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%