Lei Yu 50b7faa031 [automerger skipped] Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp" ...

am: 73c361b544  -s ours

Change-Id: I93e8e42b3892dae3d2ab8ed7683503079e93df1a

2018-10-29 13:55:51 -07:00

libs

Use proto in contextualCard object

2018-10-10 10:35:51 -07:00

protos

Add contextual card proto libraries.

2018-10-10 10:14:07 -07:00

res

Add Connected Device slice to Contextual Settings Homepage

2018-10-29 16:10:58 +08:00

src/com/android/settings

Merge "Add Connected Device slice to Contextual Settings Homepage"

2018-10-29 20:27:24 +00:00

tests

Merge "Add Connected Device slice to Contextual Settings Homepage"

2018-10-29 20:27:24 +00:00

Android.mk

Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24

2018-10-12 03:42:13 -07:00

AndroidManifest.xml

Make android.settings.SETTINGS intent go into homepage.

2018-10-28 15:59:24 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Remove obsolete chart view widgets.

2018-10-08 14:18:50 -07: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

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Add a rule to keep classes that implements CustomSliceable

2018-09-17 22:06:05 +08: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%