Stanley Tng 477cd15221 [automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev-plus-aosp ...

am: ce939610ba  -s ours

Change-Id: Icb817e909ee7f66f8b8f53c8e3572354845167a9

2018-10-02 18:05:04 -07:00

libs

Add SettingsContextualCardProvider

2018-10-02 15:04:58 +08:00

res

Merge "Support phone number in Settings slices"

2018-10-02 02:43:17 +00:00

src/com/android/settings

Merge "Set the layoutPreference not selectable"

2018-10-03 00:23:42 +00:00

tests

Merge "Check instance before casting"

2018-10-02 23:41:35 +00:00

Android.mk

Add SettingsContextualCardProvider

2018-10-02 15:04:58 +08:00

AndroidManifest.xml

Add SettingsContextualCardProvider

2018-10-02 15:04:58 +08:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Modify Settings homepage layout

2018-09-05 11:55:16 +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

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%