Janis Danisevskis fa38dc723c [automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75 am: bb5ebce8a0 -s ours am: e0a303f6b6 -s ours ...

am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf84154 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I190e05d204b477e1b34f361406679bc042ec073e

2021-03-05 06:36:21 +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 changes from topic "jr_device" into sc-dev am: dd6255a653

2021-03-05 04:50:43 +00:00

src/com/android/settings

Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b

2021-03-05 04:53:46 +00:00

tests

Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b

2021-03-05 04:53:46 +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

Merge "Adding alarms and reminders activity" into sc-dev am: a78849982d

2021-02-24 21:18:15 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Replace the SwitchBar with MainSwitch.

2021-02-23 16:21:52 +08:00

NOTICE

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%