Chien-Yu Chen f7540b42dc Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev am: fa3af7b0e7 ...

am: 890c9a7ad3  -s ours

Change-Id: I61fcbf171ab4e6e9a251a1c312ccbfa0f9c9cc83

2017-12-03 03:44:11 +00:00

res

Add controllers for default app shortcut preferences.

2017-12-01 17:21:49 -08:00

src/com/android/settings

Merge "Add controllers for default app shortcut preferences."

2017-12-02 03:12:50 +00:00

tests

Merge "Add controllers for default app shortcut preferences."

2017-12-02 03:12:50 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

2017-09-26 01:18:50 +00:00

AndroidManifest.xml

Merge "Disable DevelopmentSettingsActivity by default"

2017-11-23 01:47:53 +00:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Hook up lint color check to settings

2017-09-15 11:45:21 -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

Enable the color lint check

2017-09-18 17:01:23 -07:00

proguard.flags

Copy proguard rules needed for Lifecycle support

2017-11-15 11:20:57 -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%