summaryrefslogtreecommitdiffstats
path: root/unified_src
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-08-12 18:16:57 -0700
committerJin Cao <jinyan@google.com>2014-08-21 15:23:39 -0700
commitc6801eb828627c37b8992584767c095dfe11df62 (patch)
treeef75cff9964c8cc8c4fbfce495dc5a684b348fef /unified_src
parent28d44b2bec95381693b203f0515218aaf5418f04 (diff)
downloadandroid_packages_apps_UnifiedEmail-c6801eb828627c37b8992584767c095dfe11df62.tar.gz
android_packages_apps_UnifiedEmail-c6801eb828627c37b8992584767c095dfe11df62.tar.bz2
android_packages_apps_UnifiedEmail-c6801eb828627c37b8992584767c095dfe11df62.zip
Quantum search - version 1
I apologize in advance for this huge CL. - New icons (yay!) - Abandon framework search and handle in-app search functionality ourselves. This is made possible because we use Toolbar and can position any custom view on top. - Remove all previous search related attributes, including search providers, searchable, search authority, default search menu item layout, etc. - Cleaned up the recent history provider to contain only the functionalities we need - query, add, and delete. Instead of using the framework to add recent queries, we directly insert into our database. Since the provider no longer needs to extend ContentProvider, removed some unnecessary callbacks such as onCreate. - Custom quantum search views: - Top search bar, this is inserted in a FrameLayout on top of Toolbar. The search bar interacts with the suggestion list and AbstractActivityController via the QuantumSearchViewController interface. - Suggestions list, this is inserted in the FrameLayout that typically contains the main content pane for either one-pane or two-pane layouts. Again, this interacts with the action bar via the controller. - Voice search, this is simply an implicit intent that converts speech to text. b/16518233 Change-Id: I589c40e6c6e3d8c719856b735d0c53e8db986e65
Diffstat (limited to 'unified_src')
-rw-r--r--unified_src/com/android/mail/providers/UnifiedAccountCacheProvider.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/unified_src/com/android/mail/providers/UnifiedAccountCacheProvider.java b/unified_src/com/android/mail/providers/UnifiedAccountCacheProvider.java
index b1c131362..57f1fe8f3 100644
--- a/unified_src/com/android/mail/providers/UnifiedAccountCacheProvider.java
+++ b/unified_src/com/android/mail/providers/UnifiedAccountCacheProvider.java
@@ -24,11 +24,6 @@ public class UnifiedAccountCacheProvider extends MailAppProvider {
// The authority of our conversation provider (a forwarding provider)
// This string must match the declaration in AndroidManifest.xml
private static final String sAuthority = "com.android.mail.accountcache";
- /**
- * Authority for the suggestions provider. This is specified in AndroidManifest.xml and
- * res/xml/searchable.xml.
- */
- private static final String sSuggestionsAuthority = "com.android.mail.suggestionsprovider";
@Override
protected String getAuthority() {
@@ -36,12 +31,13 @@ public class UnifiedAccountCacheProvider extends MailAppProvider {
}
@Override
- protected Intent getNoAccountsIntent(Context context) {
+ public String getSuggestionAuthority() {
+ // UnifiedEmail does not use the default search.
return null;
}
@Override
- public String getSuggestionAuthority() {
- return sSuggestionsAuthority;
+ protected Intent getNoAccountsIntent(Context context) {
+ return null;
}
}