Automerger Merge Worker b9e2881321 [automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp am: e1763f51db -s ours ...

am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a084909 is in history

Change-Id: Ie6ff61d44fc3cc8a0b092fbd72fd4bef49c3bcc7

2020-02-24 11:59:27 +00:00

libs

Update proto for contextual_card_list.

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

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "Keep contextual card dismissal info upon deletion" into rvc-dev

2020-02-24 11:07:19 +00:00

src/com/android/settings

Merge "Keep contextual card dismissal info upon deletion" into rvc-dev

2020-02-24 11:07:19 +00:00

tests

Merge "Keep contextual card dismissal info upon deletion" into rvc-dev

2020-02-24 11:07:19 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Add Developer option to enable vendor logging in Settings app

2020-02-18 15:43:09 -08:00

AndroidManifest.xml

Merge ""Forgot my password" to start profile in locked state."

2020-02-19 19:09:20 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update the lint color check file.

2020-01-08 19:16:00 +08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Clean up owner list

2020-01-24 09:44:43 -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

Wrap tintable icons with correctly tinted drawable XML

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

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%