am d0a67be9
: am a357f81e
: am 1991e2a9
: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'd0a67be95098394fbb3fe7a05b13c9e432caff3b': Remove default search for Email
This commit is contained in:
commit
292cf3904d
@ -85,9 +85,6 @@
|
|||||||
android:hardwareAccelerated="true"
|
android:hardwareAccelerated="true"
|
||||||
android:allowBackup="false"
|
android:allowBackup="false"
|
||||||
android:supportsRtl="true" >
|
android:supportsRtl="true" >
|
||||||
<!-- Enable search in all activities -->
|
|
||||||
<meta-data android:name="android.app.default_searchable"
|
|
||||||
android:value="com.android.email2.ui.MailActivityEmail" />
|
|
||||||
<activity
|
<activity
|
||||||
android:name="com.android.email.activity.ComposeActivityEmail"
|
android:name="com.android.email.activity.ComposeActivityEmail"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
@ -239,7 +236,6 @@
|
|||||||
<action android:name="android.intent.action.SEARCH" />
|
<action android:name="android.intent.action.SEARCH" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity-alias android:name="com.android.email.activity.Welcome"
|
<activity-alias android:name="com.android.email.activity.Welcome"
|
||||||
@ -405,14 +401,6 @@
|
|||||||
<grant-uri-permission android:pathPattern=".*" />
|
<grant-uri-permission android:pathPattern=".*" />
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<!-- The android:name is the name of the Provider class which is stored in
|
|
||||||
UnifiedEmail, and has package name com.android.mail.providers and the class is
|
|
||||||
called SuggestionsProvider. The authority name is specified in the MailAppProvider
|
|
||||||
which is specific to the two apps separately. -->
|
|
||||||
<provider android:name="com.android.mail.providers.SuggestionsProvider"
|
|
||||||
android:authorities="com.android.email.suggestionsprovider"
|
|
||||||
android:exported="true" />
|
|
||||||
|
|
||||||
<service android:name="com.android.mail.compose.EmptyService"/>
|
<service android:name="com.android.mail.compose.EmptyService"/>
|
||||||
<!-- Widget -->
|
<!-- Widget -->
|
||||||
<receiver android:name=".provider.WidgetProvider" android:label="@string/app_name">
|
<receiver android:name=".provider.WidgetProvider" android:label="@string/app_name">
|
||||||
|
@ -17,9 +17,6 @@
|
|||||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
<!-- Names of packages and authorities that are common to all apps
|
<!-- Names of packages and authorities that are common to all apps
|
||||||
and read from resources -->
|
and read from resources -->
|
||||||
<!-- Name of the search suggestions authority that looks up recent suggestions. This
|
|
||||||
needs to be modified in AndroidManifest.xml and res/xml/searchable.xml as well. -->
|
|
||||||
<string name="suggestions_authority" translatable="false">com.android.email.suggestionsprovider</string>
|
|
||||||
|
|
||||||
<!-- Permissions label for reading attachments -->
|
<!-- Permissions label for reading attachments -->
|
||||||
<string name="permission_read_attachment_label">Read email attachments</string>
|
<string name="permission_read_attachment_label">Read email attachments</string>
|
||||||
@ -799,7 +796,6 @@
|
|||||||
<string name="authority_email_provider" translatable="false">com.android.email.provider</string>
|
<string name="authority_email_provider" translatable="false">com.android.email.provider</string>
|
||||||
<string name="authority_conversation_provider" translatable="false">com.android.email.conversation.provider</string>
|
<string name="authority_conversation_provider" translatable="false">com.android.email.conversation.provider</string>
|
||||||
<string name="authority_account_cache_provider" translatable="false">com.android.email.accountcache</string>
|
<string name="authority_account_cache_provider" translatable="false">com.android.email.accountcache</string>
|
||||||
<string name="authority_suggestions_provider" translatable="false">com.android.email.suggestionsprovider</string>
|
|
||||||
<string name="protocol_legacy_imap" translatable="false">imap</string>
|
<string name="protocol_legacy_imap" translatable="false">imap</string>
|
||||||
<string name="protocol_imap" translatable="false">imap</string>
|
<string name="protocol_imap" translatable="false">imap</string>
|
||||||
<string name="protocol_pop3" translatable="false">pop3</string>
|
<string name="protocol_pop3" translatable="false">pop3</string>
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2012 Google Inc.
|
|
||||||
Licensed to The Android Open Source Project.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
<searchable xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:label="@string/search_title"
|
|
||||||
android:hint="@string/search_hint"
|
|
||||||
android:icon="@drawable/ic_menu_search"
|
|
||||||
android:searchSuggestAuthority="com.android.email.suggestionsprovider"
|
|
||||||
android:searchSuggestSelection="query LIKE ?"
|
|
||||||
android:searchSuggestIntentAction="android.intent.action.SEARCH"
|
|
||||||
android:imeOptions="actionSearch" />
|
|
@ -26,12 +26,6 @@ import com.android.email.activity.setup.AccountSetupFinal;
|
|||||||
public class EmailAccountCacheProvider extends MailAppProvider {
|
public class EmailAccountCacheProvider extends MailAppProvider {
|
||||||
// Content provider for Email
|
// Content provider for Email
|
||||||
private static String sAuthority;
|
private static String sAuthority;
|
||||||
/**
|
|
||||||
* Authority for the suggestions provider. This is specified in AndroidManifest.xml and
|
|
||||||
* res/xml/searchable.xml.
|
|
||||||
*/
|
|
||||||
private static String sSuggestionsAuthority;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAuthority() {
|
protected String getAuthority() {
|
||||||
if (sAuthority == null) {
|
if (sAuthority == null) {
|
||||||
@ -47,9 +41,6 @@ public class EmailAccountCacheProvider extends MailAppProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSuggestionAuthority() {
|
public String getSuggestionAuthority() {
|
||||||
if (sSuggestionsAuthority == null) {
|
return null;
|
||||||
sSuggestionsAuthority = getContext().getString(R.string.authority_suggestions_provider);
|
|
||||||
}
|
|
||||||
return sSuggestionsAuthority;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user