Matthew Fritze 5baaa7aef9 Merge "Prevent crash when removing duplicates" into oc-dev am: 7a148b9e09 ...

am: 752b18191b  -s ours

Change-Id: I05c487d4a8fc39944065a7f305afb87128e25400

2017-06-01 21:29:35 +00:00

res

Merge "Add search bar to SearchActivity."

2017-06-01 19:57:20 +00:00

src/com/android/settings

Merge "Move BatteryInfo to settings from settingslib"

2017-06-01 20:16:42 +00:00

tests

Merge "Move BatteryInfo to settings from settingslib"

2017-06-01 20:16:42 +00:00

Android.mk

Initial search bar implementation.

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

AndroidManifest.xml

Merge "Add search bar to SearchActivity."

2017-06-01 19:57:20 +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%