Updating the app search buton text
Bug: 28774501
Change-Id: I268a2d98f70d160c91ebd8fc796f3626ae67c159
diff --git a/res/layout/all_apps_search_market.xml b/res/layout/all_apps_search_market.xml
index 2e38ea0..0a1aed5 100644
--- a/res/layout/all_apps_search_market.xml
+++ b/res/layout/all_apps_search_market.xml
@@ -24,6 +24,7 @@
android:fontFamily="sans-serif-medium"
android:textSize="14sp"
android:textColor="@color/launcher_accent_color"
+ android:text="@string/all_apps_search_market_message"
android:textAllCaps="true"
android:focusable="true"
android:background="@drawable/all_apps_search_market_bg" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e675a92..9f011e5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,9 +52,8 @@
<string name="all_apps_loading_message">Loading Apps…</string>
<!-- No-search-results text. [CHAR_LIMIT=50] -->
<string name="all_apps_no_search_results">No Apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string>
- <!-- Search market text. This is a format string where the first argument is the name of the activity
- handling the search. The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
- <string name="all_apps_search_market_message">Go to <xliff:g id="query" example="Play Store">%1$s</xliff:g></string>
+ <!-- Label for the button which allows the user to get app search results. [CHAR_LIMIT=50] -->
+ <string name="all_apps_search_market_message">Search for more apps</string>
<!-- Drag and drop -->
<skip />
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 115db9d..cfa67b1 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -351,12 +351,6 @@
// The text to show when there are no search results and no market search handler.
private String mEmptySearchMessage;
- // The name of the market app which handles searches, to be used in the format str
- // below when updating the search-market view. Only needs to be loaded once.
- private String mMarketAppName;
- // The text to show when there is a market app which can handle a specific query, updated
- // each time the search query changes.
- private String mMarketSearchMessage;
// The intent to send off to the market app, updated each time the search query changes.
private Intent mMarketSearchIntent;
@@ -402,14 +396,6 @@
public void setSearchController(AllAppsSearchBarController searchController) {
mSearchController = searchController;
-
- // Resolve the market app handling additional searches
- PackageManager pm = mLauncher.getPackageManager();
- ResolveInfo marketInfo = pm.resolveActivity(mSearchController.createMarketSearchIntent(""),
- PackageManager.MATCH_DEFAULT_ONLY);
- if (marketInfo != null) {
- mMarketAppName = marketInfo.loadLabel(pm).toString();
- }
}
/**
@@ -419,11 +405,7 @@
public void setLastSearchQuery(String query) {
Resources res = mLauncher.getResources();
mEmptySearchMessage = res.getString(R.string.all_apps_no_search_results, query);
- if (mMarketAppName != null) {
- mMarketSearchMessage = res.getString(R.string.all_apps_search_market_message,
- mMarketAppName);
- mMarketSearchIntent = mSearchController.createMarketSearchIntent(query);
- }
+ mMarketSearchIntent = mSearchController.createMarketSearchIntent(query);
}
/**
@@ -529,10 +511,8 @@
TextView searchView = (TextView) holder.mContent;
if (mMarketSearchIntent != null) {
searchView.setVisibility(View.VISIBLE);
- searchView.setContentDescription(mMarketSearchMessage);
searchView.setGravity(mApps.hasNoFilteredResults() ? Gravity.CENTER :
Gravity.START | Gravity.CENTER_VERTICAL);
- searchView.setText(mMarketSearchMessage);
} else {
searchView.setVisibility(View.GONE);
}