Cassie Wang 7976f1e76d Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 am: ccdd06e496 am: f582544551 ...

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

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

2023-10-23 07:02:30 +00:00

aconfig

Merge "Add setting flag for enabling voice activation apps in Special app access." into main

2023-10-20 18:37:40 +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

Merge "Remove Settings preference_widget_primary_switch" into main

2023-10-23 04:17:52 +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-10-06 15:42:54 -07:00

src/com/android/settings

Merge "Remove Settings preference_widget_primary_switch" into main

2023-10-23 04:17:52 +00:00

tests

Merge "Ignore flaky test case to unblock presubmit" into udc-qpr-dev-plus-aosp am: a00e9399d8

2023-10-20 02:02:26 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

Merge "Settings for Polite Notifications" into main

2023-10-11 12:04:37 +00:00

AndroidManifest.xml

Fix battery usage database is not clear when time is changed

2023-10-11 17:40:14 +08: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

Revert "Move SettingsUITests to presubmit"

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

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%