Stephen Li 5be4c0fdfd Manually merge changes from giant AOSP topic ...

Change-Id: Iec1a4fdf7f5e04f091608f148aa770cfcd5f8acc

2017-12-07 23:56:30 +00:00

res

Merge "Revert "Update style names due to theme migration""

2017-12-06 19:39:56 +00:00

src/com/android/settings

Merge "Guide user towards adoption when card is "empty"."

2017-12-07 03:09:59 +00:00

tests

Merge "Fix failure of ZenModeAutomaticRulesPreferenceControllerTest"

2017-12-07 21:26:10 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

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

AndroidManifest.xml

Add feature flag for battery settings page.

2017-12-05 13:15:13 -08: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

…

NOTICE

…

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

Remove proguard rules that are imported via aapt2

2017-11-29 15:02:15 -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%