diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-23 16:12:50 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-06-26 14:56:36 -0700 |
commit | 89d5c5a31bd6cf4caf815b680ec670896b91803d (patch) | |
tree | b9d0a9a9fd6dec880fb6076bc2b8d4f38870839f /src/com/android/launcher3/allapps/AllAppsGridAdapter.java | |
parent | bbe504d24d5e0757d1a7772af822b7a6e274c9b4 (diff) | |
download | android_packages_apps_Trebuchet-89d5c5a31bd6cf4caf815b680ec670896b91803d.tar.gz android_packages_apps_Trebuchet-89d5c5a31bd6cf4caf815b680ec670896b91803d.tar.bz2 android_packages_apps_Trebuchet-89d5c5a31bd6cf4caf815b680ec670896b91803d.zip |
Updating fast scrollbar UI in Landscape
Creating a separate view for FastScrollBar and moving all the relavant logic in
the view.
For protrait, the touch handling is delegated by the recycler view just like before.
For landscape, the dcrollbar does not overlay with recyclerView and handles the touch
itself
Bug: 37015359
Change-Id: Ie1981326457ba739bdf0ac8063db1065f395f133
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsGridAdapter.java')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index d6514a83f..1054a5633 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -69,16 +69,13 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. // A divider that separates the apps list and the search market button public static final int VIEW_TYPE_SEARCH_MARKET_DIVIDER = 1 << 5; - // The divider under the search field - public static final int VIEW_TYPE_SEARCH_DIVIDER = 1 << 6; // The divider that separates prediction icons from the app list - public static final int VIEW_TYPE_PREDICTION_DIVIDER = 1 << 7; - public static final int VIEW_TYPE_APPS_LOADING_DIVIDER = 1 << 8; - public static final int VIEW_TYPE_DISCOVERY_ITEM = 1 << 9; + public static final int VIEW_TYPE_PREDICTION_DIVIDER = 1 << 6; + public static final int VIEW_TYPE_APPS_LOADING_DIVIDER = 1 << 7; + public static final int VIEW_TYPE_DISCOVERY_ITEM = 1 << 8; // Common view type masks - public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_SEARCH_DIVIDER - | VIEW_TYPE_SEARCH_MARKET_DIVIDER + public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_SEARCH_MARKET_DIVIDER | VIEW_TYPE_PREDICTION_DIVIDER; public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON | VIEW_TYPE_PREDICTION_ICON; @@ -319,9 +316,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. } }); return new ViewHolder(searchMarketView); - case VIEW_TYPE_SEARCH_DIVIDER: - return new ViewHolder(mLayoutInflater.inflate( - R.layout.all_apps_search_divider, parent, false)); case VIEW_TYPE_APPS_LOADING_DIVIDER: View loadingDividerView = mLayoutInflater.inflate( R.layout.all_apps_discovery_loading_divider, parent, false); |