Matthew Fritze 54ed30e735 Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev am: 21b22f0154 ...

am: 8c0d24cb6d

Change-Id: I1e020f900c7d0ad91821a26d424b361efad45ff1

2017-08-01 01:13:22 +00:00

res

Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev am: 5e9b138691

2017-08-01 00:42:41 +00:00

src/com/android/settings

Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev am: 21b22f0154

2017-08-01 01:13:22 +00:00

tests

Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev am: 5e9b138691

2017-08-01 00:42:41 +00:00

Android.mk

Initial search bar implementation.

2017-05-31 15:24:25 -07:00

AndroidManifest.xml

Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7 am: 1b62cfb973" into oc-mr1-dev-plus-aosp

2017-07-31 20:22:05 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -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

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00: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%