Fix full widgets picker fast scroller height.
1. Fix the app title to one line. 2. Use the measured height of a header view to estimate the available fast scroll bar height. Test: Open full widgets picker. Scroll to the bottom by scroll gesture. Observe the fast scroll bar indicator is correctly shown. Scroll back to top and then use the fast scroll bar to scroll to the end of the page. Observe the last app row is aligned to the bottom of the page. Bug: 188914448 Change-Id: I57a2419d1fbfc8f946a932eebfefb67ae0c07eb6
This commit is contained in:
parent
81f5ff3b3b
commit
e90dddaaa0
|
@ -49,6 +49,8 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="start|center_vertical"
|
android:layout_gravity="start|center_vertical"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
tools:text="App name" />
|
tools:text="App name" />
|
||||||
|
|
|
@ -49,10 +49,10 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
|
||||||
private final int mScrollbarTop;
|
private final int mScrollbarTop;
|
||||||
|
|
||||||
private final Point mFastScrollerOffset = new Point();
|
private final Point mFastScrollerOffset = new Point();
|
||||||
private final int mEstimatedWidgetListHeaderHeight;
|
|
||||||
private boolean mTouchDownOnScroller;
|
private boolean mTouchDownOnScroller;
|
||||||
private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
|
private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
|
||||||
private int mLastVisibleWidgetContentTableHeight = 0;
|
private int mLastVisibleWidgetContentTableHeight = 0;
|
||||||
|
private int mWidgetHeaderHeight = 0;
|
||||||
@Nullable private OnContentChangeListener mOnContentChangeListener;
|
@Nullable private OnContentChangeListener mOnContentChangeListener;
|
||||||
|
|
||||||
public WidgetsRecyclerView(Context context) {
|
public WidgetsRecyclerView(Context context) {
|
||||||
|
@ -71,9 +71,6 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
|
||||||
|
|
||||||
ActivityContext activity = ActivityContext.lookupContext(getContext());
|
ActivityContext activity = ActivityContext.lookupContext(getContext());
|
||||||
DeviceProfile grid = activity.getDeviceProfile();
|
DeviceProfile grid = activity.getDeviceProfile();
|
||||||
mEstimatedWidgetListHeaderHeight = grid.iconSizePx
|
|
||||||
+ 2 * context.getResources().getDimensionPixelSize(
|
|
||||||
R.dimen.widget_list_header_view_vertical_padding);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -164,6 +161,14 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
|
||||||
if (view instanceof TableLayout) {
|
if (view instanceof TableLayout) {
|
||||||
// This assumes there is ever only one content shown in this recycler view.
|
// This assumes there is ever only one content shown in this recycler view.
|
||||||
mLastVisibleWidgetContentTableHeight = view.getMeasuredHeight();
|
mLastVisibleWidgetContentTableHeight = view.getMeasuredHeight();
|
||||||
|
} else if (view instanceof WidgetsListHeader
|
||||||
|
&& mLastVisibleWidgetContentTableHeight == 0
|
||||||
|
&& view.getMeasuredHeight() > 0) {
|
||||||
|
// This assumes all header views are of the same height.
|
||||||
|
RecyclerView.LayoutParams layoutParams =
|
||||||
|
(RecyclerView.LayoutParams) view.getLayoutParams();
|
||||||
|
mWidgetHeaderHeight = view.getMeasuredHeight() + layoutParams.topMargin
|
||||||
|
+ layoutParams.bottomMargin;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,7 +267,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
|
||||||
WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
|
WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
|
||||||
if (entry instanceof WidgetsListHeaderEntry
|
if (entry instanceof WidgetsListHeaderEntry
|
||||||
|| entry instanceof WidgetsListSearchHeaderEntry) {
|
|| entry instanceof WidgetsListSearchHeaderEntry) {
|
||||||
totalItemsHeight += mEstimatedWidgetListHeaderHeight;
|
totalItemsHeight += mWidgetHeaderHeight;
|
||||||
} else if (entry instanceof WidgetsListContentEntry) {
|
} else if (entry instanceof WidgetsListContentEntry) {
|
||||||
totalItemsHeight += mLastVisibleWidgetContentTableHeight;
|
totalItemsHeight += mLastVisibleWidgetContentTableHeight;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue