Jeremy Goldman d5e5aaa818 [automerger skipped] Merge "Connect VPN warning help icon with the network & internet page." into sc-dev am: 025301da1f -s ours ...

am skip reason: skip tag Change-Id I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401 with SHA-1 7a68eb3b5e is already in history

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

Change-Id: Ia41af792e568a88464b13a31934f15e0a0c092c5

2021-03-24 05:45:02 +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-25 15:05:14 -08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-03-24 04:59:52 +00:00

src/com/android/settings

Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev am: 8debbfa8a4

2021-03-24 04:44:09 +00:00

tests

Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev am: 8debbfa8a4

2021-03-24 04:44:09 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

AndroidManifest.xml

Request new Bluetooth runtime permissions. am: 9e07eab08f

2021-03-23 13:10:31 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix the issue of the repo upload hooking checker

2021-03-12 22:25:10 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00:00

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%