SongFerng Wang fea98ca447 [automerger skipped] Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292 am: a0a079ed11 -s ours ...

am skip reason: Change-Id I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a with SHA-1 e18207b951 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86a1cd6731be7b0687cd5b0c1ce572c78e90a442

2021-03-04 08:24: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 "Bold text string update" into sc-dev

2021-03-03 22:31:17 +00:00

src/com/android/settings

Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev

2021-03-03 22:28:41 +00:00

tests

Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev

2021-03-03 20:45:29 +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

Adding alarms and reminders activity

2021-02-23 22:32:24 -08: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%