diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-21 00:35:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-21 00:35:05 +0000 |
| commit | 852974375d06ad6a81ac40fdd0a228fe0c6fa7d9 (patch) | |
| tree | ea733653af61e637ba341d0c9aa0a04c632543f7 | |
| parent | 2eeae10e984993af563b4d207deac855ca7d8620 (diff) | |
| parent | a92447a7fdcdd8392628bb15dad9730428b71160 (diff) | |
| download | android_packages_apps_Trebuchet-852974375d06ad6a81ac40fdd0a228fe0c6fa7d9.tar.gz android_packages_apps_Trebuchet-852974375d06ad6a81ac40fdd0a228fe0c6fa7d9.tar.bz2 android_packages_apps_Trebuchet-852974375d06ad6a81ac40fdd0a228fe0c6fa7d9.zip | |
Merge "Centered all apps search text" into ub-launcher3-calgary
| -rw-r--r-- | res/layout/all_apps_search_market.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/res/layout/all_apps_search_market.xml b/res/layout/all_apps_search_market.xml index 0199212b9..3f19b2515 100644 --- a/res/layout/all_apps_search_market.xml +++ b/res/layout/all_apps_search_market.xml @@ -18,7 +18,7 @@ android:id="@+id/search_market_text" android:layout_width="match_parent" android:layout_height="48dp" - android:gravity="start|center_vertical" + android:gravity="center" android:paddingLeft="@dimen/container_fastscroll_thumb_max_width" android:paddingRight="@dimen/container_fastscroll_thumb_max_width" android:fontFamily="sans-serif-medium" diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 97c46b163..d8f9fb189 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -66,7 +66,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. public static final int VIEW_TYPE_PREDICTION_ICON = 1 << 2; // The message shown when there are no filtered results public static final int VIEW_TYPE_EMPTY_SEARCH = 1 << 3; - // A divider that separates the apps list and the search market button + // The message to continue to a market search when there are no filtered results public static final int VIEW_TYPE_SEARCH_MARKET = 1 << 4; // We use various dividers for various purposes. They share enough attributes to reuse layouts, @@ -528,8 +528,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. TextView searchView = (TextView) holder.mContent; if (mMarketSearchIntent != null) { searchView.setVisibility(View.VISIBLE); - searchView.setGravity(mApps.hasNoFilteredResults() ? Gravity.CENTER : - Gravity.START | Gravity.CENTER_VERTICAL); } else { searchView.setVisibility(View.GONE); } |