Fan Zhang e9876a6a80 [automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am: fcaf926dc1 -s ours am: 6e65a32468 -s ours ...

am: 9fe69d724d  -s ours

Change-Id: If7f67c5a8f32045dd9e1b63f61614b03cfbd9bed

2018-08-28 13:47:28 -07:00

res

Merge "Create the main architecture for Settings Dynamic Homepage"

2018-08-25 01:09:17 +00:00

src/com/android/settings

Merge "Remove unneeded getDisplayableCards() in DashboardAdapter"

2018-08-28 18:36:23 +00:00

tests

Merge "Updated the CardContentProvider"

2018-08-28 15:04:26 +00:00

Android.mk

Clean up unused deps

2018-07-25 15:25:05 -07:00

AndroidManifest.xml

Merge "Hide SettingsSlice provider"

2018-08-16 15:56:14 +00:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Add colors to whitelist

2018-08-15 17:04:42 -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

Settings Fragment Migration (Build pass app)

2018-07-11 18:24:51 -07: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%