Matthew Fritze 824f25320a Merge "Search results always highlight proper results" into oc-dev ...

am: 2a32cb6a33

Change-Id: I1bc6297cc75aa833184a00598f5930aa3ca114dc

2017-06-09 01:23:39 +00:00

..

applications

Renaming intent action for unknown sources

2017-04-06 18:05:32 -07:00

bluetooth

Revert "Revert "Convert BT preference to use TwoTargetPreference""

2017-04-11 09:45:27 -07:00

deviceinfo

Replace footer with regular preference

2017-02-14 14:12:56 -08:00

fingerprint

Update fingerprint enrolling flow

2017-03-13 10:22:06 -07:00

fuelgauge

Revert "Revert "Convert BT preference to use TwoTargetPreference""

2017-04-11 09:45:27 -07:00

notification

Move automatic rules to main DND settings page.

2017-03-27 15:57:39 -04:00

password

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

search

Add search bar to SearchActivity.

2017-06-01 11:01:00 -07:00

tests

Update usage of ActivityManagerNative.

2016-11-14 12:59:11 -08:00

users

Removed emergency info and add user when locked from Users settings.

2017-02-24 12:38:57 -08:00

vpn2

Change build targets for settings tests

2016-01-21 12:32:15 +00:00

CreateShortcutTest.java

Updating CreateShortcut activity to use the new ShortcutManager APIs

2017-01-19 13:39:13 -08:00

DisplaySettingsTest.java

Add test to verify no crash on selecting brightness level.

2017-04-06 15:10:29 -07:00

EncryptionInterstitialTest.java

Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity.

2017-04-26 17:37:16 -07:00

SettingsHookTests.java

Change build targets for settings tests

2016-01-21 12:32:15 +00:00

SettingsPreferenceFragmentTest.java

Search results always highlight proper results

2017-06-08 16:25:52 -07:00