Pavel Grafov 4350fa4c78 [automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3 am: 18c04f023a -s ours ...

am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 16d588c11a is already in history

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

Change-Id: I8f040b6e43390b5efb674bfc464aa4a68527de01

2021-04-02 19:25:49 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-12 17:08:01 -08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

2021-03-30 06:24:26 +00:00

src/com/android/settings

Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d

2021-04-01 16:24:07 +00:00

tests

Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325

2021-03-31 15:44:41 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge "Export proguard.flags, manifest and sources for use by SettingsGoogle" into rvc-qpr-dev-plus-aosp

2021-02-23 04:12:50 +00:00

AndroidManifest.xml

Merge ab/7061308 into stage.

2021-02-21 09:25:11 -08:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Workaround for Recent app icon disappear

2020-06-16 17:30:32 +08:00

NOTICE

…

OWNERS

Update the OWNER files

2020-03-11 16:45:14 +08:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +08:00

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +00:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%