diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-29 13:14:14 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-08 14:55:22 -0800 |
commit | 0ac7ede56afebe4401c0636196f5844be573ad68 (patch) | |
tree | c4bdfce0b5f788880354845ab51ae293bd608d1b /src/com/android/launcher3/widget | |
parent | 0e0498031092488ff166145c12ce36cc0a80c490 (diff) | |
download | android_packages_apps_Trebuchet-0ac7ede56afebe4401c0636196f5844be573ad68.tar.gz android_packages_apps_Trebuchet-0ac7ede56afebe4401c0636196f5844be573ad68.tar.bz2 android_packages_apps_Trebuchet-0ac7ede56afebe4401c0636196f5844be573ad68.zip |
Merging search bar with all apps
Change-Id: I78577124cd3c05d52669c3e52b0294d6eb1d194d
Diffstat (limited to 'src/com/android/launcher3/widget')
-rw-r--r-- | src/com/android/launcher3/widget/WidgetsContainerView.java | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index b780f590b..8b9ac1f75 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -65,7 +65,6 @@ public class WidgetsContainerView extends BaseContainerView private IconCache mIconCache; /* Recycler view related member variables */ - private View mContent; private WidgetsRecyclerView mView; private WidgetsListAdapter mAdapter; @@ -99,8 +98,7 @@ public class WidgetsContainerView extends BaseContainerView @Override protected void onFinishInflate() { super.onFinishInflate(); - mContent = findViewById(R.id.content); - mView = (WidgetsRecyclerView) findViewById(R.id.widgets_list_view); + mView = (WidgetsRecyclerView) getContentView(); mView.setAdapter(mAdapter); // This extends the layout space so that preloading happen for the {@link RecyclerView} @@ -120,15 +118,6 @@ public class WidgetsContainerView extends BaseContainerView // Returns views used for launcher transitions. // - public View getContentView() { - return mView; - } - - public View getRevealView() { - // TODO(hyunyoungs): temporarily use apps view transition. - return findViewById(R.id.widgets_reveal_view); - } - public void scrollToTop() { mView.scrollToPosition(0); } @@ -338,21 +327,8 @@ public class WidgetsContainerView extends BaseContainerView // // Container rendering related. // - @Override - protected void onUpdateBackgroundAndPaddings(Rect searchBarBounds, Rect padding) { - // Apply the top-bottom padding to the content itself so that the launcher transition is - // clipped correctly - mContent.setPadding(0, padding.top, 0, padding.bottom); - - // TODO: Use quantum_panel_dark instead of quantum_panel_shape_dark. - InsetDrawable background = new InsetDrawable( - getResources().getDrawable(R.drawable.quantum_panel_shape_dark), padding.left, 0, - padding.right, 0); - Rect bgPadding = new Rect(); - background.getPadding(bgPadding); - mView.setBackground(background); - getRevealView().setBackground(background.getConstantState().newDrawable()); + protected void onUpdateBgPadding(Rect padding, Rect bgPadding) { mView.updateBackgroundPadding(bgPadding); } |