Commit e21a714a authored by Ted Choc's avatar Ted Choc Committed by Commit Bot

Add 8dp top padding to the long press history popup.

BUG=800033

Change-Id: I0007ae432782e4222f1eed4aad03259a9e25a784
Reviewed-on: https://chromium-review.googlesource.com/1167556Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581691}
parent eeab6d71
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/navigation_popup_item_height" android:layout_height="wrap_content"
android:paddingStart="@dimen/navigation_popup_default_padding" android:paddingStart="@dimen/navigation_popup_default_padding"
android:paddingEnd="@dimen/navigation_popup_default_padding" android:paddingEnd="@dimen/navigation_popup_default_padding"
android:gravity="center_vertical" android:gravity="center_vertical"
...@@ -32,9 +32,11 @@ ...@@ -32,9 +32,11 @@
<TextView <TextView
android:id="@+id/entry_title" android:id="@+id/entry_title"
android:gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/navigation_popup_default_padding" android:layout_marginStart="@dimen/navigation_popup_default_padding"
android:minHeight="@dimen/navigation_popup_item_height"
android:textAppearance="@style/BlackTitle1" android:textAppearance="@style/BlackTitle1"
android:singleLine="true" /> android:singleLine="true" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -593,5 +593,6 @@ ...@@ -593,5 +593,6 @@
<dimen name="navigation_popup_width">312dp</dimen> <dimen name="navigation_popup_width">312dp</dimen>
<dimen name="navigation_popup_item_height">56dp</dimen> <dimen name="navigation_popup_item_height">56dp</dimen>
<dimen name="navigation_popup_default_padding">16dp</dimen> <dimen name="navigation_popup_default_padding">16dp</dimen>
<dimen name="navigation_popup_top_padding">8dp</dimen>
<dimen name="navigation_popup_favicon_bg_size">36dp</dimen> <dimen name="navigation_popup_favicon_bg_size">36dp</dimen>
</resources> </resources>
...@@ -260,7 +260,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt ...@@ -260,7 +260,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
} }
private class NavigationAdapter extends BaseAdapter { private class NavigationAdapter extends BaseAdapter {
private boolean mInReverseOrder; boolean mInReverseOrder;
public void reverseOrder() { public void reverseOrder() {
mInReverseOrder = true; mInReverseOrder = true;
...@@ -299,6 +299,8 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt ...@@ -299,6 +299,8 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
} }
private class NewNavigationAdapter extends NavigationAdapter { private class NewNavigationAdapter extends NavigationAdapter {
private Integer mTopPadding;
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
EntryViewHolder viewHolder; EntryViewHolder viewHolder;
...@@ -306,6 +308,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt ...@@ -306,6 +308,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
LayoutInflater inflater = LayoutInflater.from(parent.getContext()); LayoutInflater inflater = LayoutInflater.from(parent.getContext());
convertView = inflater.inflate(R.layout.navigation_popup_item, parent, false); convertView = inflater.inflate(R.layout.navigation_popup_item, parent, false);
viewHolder = new EntryViewHolder(); viewHolder = new EntryViewHolder();
viewHolder.mContainer = convertView;
viewHolder.mImageView = convertView.findViewById(R.id.favicon_img); viewHolder.mImageView = convertView.findViewById(R.id.favicon_img);
viewHolder.mTextView = convertView.findViewById(R.id.entry_title); viewHolder.mTextView = convertView.findViewById(R.id.entry_title);
convertView.setTag(viewHolder); convertView.setTag(viewHolder);
...@@ -317,11 +320,23 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt ...@@ -317,11 +320,23 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
setViewText(entry, viewHolder.mTextView); setViewText(entry, viewHolder.mTextView);
viewHolder.mImageView.setImageBitmap(entry.getFavicon()); viewHolder.mImageView.setImageBitmap(entry.getFavicon());
if (mInReverseOrder) {
View container = viewHolder.mContainer;
if (mTopPadding == null) {
mTopPadding = container.getResources().getDimensionPixelSize(
R.dimen.navigation_popup_top_padding);
}
viewHolder.mContainer.setPadding(container.getPaddingLeft(),
position == 0 ? mTopPadding : 0, container.getPaddingRight(),
container.getPaddingBottom());
}
return convertView; return convertView;
} }
} }
private static class EntryViewHolder { private static class EntryViewHolder {
View mContainer;
ImageView mImageView; ImageView mImageView;
TextView mTextView; TextView mTextView;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment