Skip to content

GitLab

T
tangled
Commit 9676efc3 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot
Browse files
Options

Revert "Add animation to history info header" 

This reverts commit 28b06e6b.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Add animation to history info header
> 
> + Make DateDividedAdapter support multiple header items so that
>   privacy disclaimers and clear browsing data button can be seperate
>   items in recycler view to support show/hide animation.
> + Hide info button when info header is not visible on scrolling down
>   in both history and downloads.
> + Remove header when history items are all deleted.
> 
> BUG=689322
> 
> Change-Id: Idbcae648ba277eb82b87bbe5a0667373bb09fc1a
> Reviewed-on: https://chromium-review.googlesource.com/560672
> Commit-Queue: Becky Zhou <huayinz@chromium.org>
> Reviewed-by: Theresa <twellington@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#488031}

TBR=tedchoc@chromium.org,twellington@chromium.org,huayinz@chromium.org

Change-Id: Iae0a049dfa302ca835a927e7cbd6e20c5f78fff3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 689322
Reviewed-on: https://chromium-review.googlesource.com/580028Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488287}
parent e2c2c98f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 437 deletions
chrome/android/java/res/layout/date_divided_adapter_header_view_holder.xml deleted 100644 → 0
View file @ e2c2c98f
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2017 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
\ No newline at end of file
chrome/android/java/res/layout/history_clear_browsing_data_header.xml → chrome/android/java/res/layout/history_header.xml
View file @ 9676efc3
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2017 The Chromium Authors. All rights reserved.
<!-- Copyright 2016 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:background="@null" >
android:orientation="vertical"
android:layout_marginBottom="8dp" >
<LinearLayout
android:id="@+id/privacy_disclaimers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="8dp"
android:visibility="gone"
android:layout_marginBottom="16dp" >
<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/signed_in_not_synced"
style="@style/PrivacyDisclaimerText" />
<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/signed_in_synced"
style="@style/PrivacyDisclaimerText" />
<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/other_forms_of_browsing_history"
style="@style/PrivacyDisclaimerText" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_single" >
<!-- TODO(twellington): change start/end padding back to 16dp and remove duplicate
FrameLayout when list item background is removed. -->
<!-- TODO(twellington): change start/end padding back to 16dp
when new assets with correct built in padding
are available. -->
<Button
android:id="@+id/clear_browsing_data_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
style="@style/ButtonCompatBorderless"
android:paddingTop="16dp"
android:paddingBottom="16dp"
......@@ -30,5 +54,6 @@
android:textAllCaps="true"
android:textColor="@color/blue_when_enabled"
android:textSize="14sp" />
</FrameLayout>
</FrameLayout>
\ No newline at end of file
</LinearLayout>
\ No newline at end of file
chrome/android/java/res/layout/history_privacy_disclaimer_header.xml deleted 100644 → 0
View file @ e2c2c98f
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2017 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp" >
<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/signed_in_not_synced"
style="@style/PrivacyDisclaimerText" />
<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/signed_in_synced"
style="@style/PrivacyDisclaimerText" />
<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/other_forms_of_browsing_history"
style="@style/PrivacyDisclaimerText" />
<Space
android:id="@+id/privacy_disclaimer_bottom_space"
android:layout_width="match_parent"
android:layout_height="8dp" />
</LinearLayout>
\ No newline at end of file
chrome/android/java/res/layout/selectable_list_layout.xml
View file @ 9676efc3
......@@ -21,8 +21,6 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:clipToPadding="false"
android:visibility="gone" />
<TextView
......
chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java
View file @ 9676efc3
......@@ -9,7 +9,6 @@ import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView.ViewHolder;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import org.chromium.base.ContextUtils;
......@@ -168,7 +167,6 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
private int mFilter = DownloadFilter.FILTER_ALL;
private String mSearchQuery = EMPTY_QUERY;
private SpaceDisplay mSpaceDisplay;
private HeaderItem mSpaceDisplayHeaderItem;
private boolean mIsSearching;
private boolean mShouldShowStorageInfoHeader;
......@@ -193,8 +191,6 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
mBackendProvider = provider;
mUiConfig = uiConfig;
generateHeaderItems();
DownloadItemSelectionDelegate selectionDelegate =
(DownloadItemSelectionDelegate) mBackendProvider.getSelectionDelegate();
selectionDelegate.initialize(this);
......@@ -367,31 +363,27 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
holder.getItemView().displayItem(mBackendProvider, item);
}
@Override
protected void bindViewHolderForHeaderItem(ViewHolder viewHolder, HeaderItem headerItem) {
super.bindViewHolderForHeaderItem(viewHolder, headerItem);
mSpaceDisplay.onChanged();
}
@Override
protected ItemGroup createGroup(long timeStamp) {
return new DownloadItemGroup(timeStamp);
}
/**
* Initialize space display view in storage info header and generate header item for it.
*/
void generateHeaderItems() {
mSpaceDisplay = new SpaceDisplay(null, this);
View view = mSpaceDisplay.getView();
registerAdapterDataObserver(mSpaceDisplay);
if (mUiConfig != null) {
MarginResizer.createAndAttach(view, mUiConfig,
view.getResources().getDimensionPixelSize(R.dimen.list_item_default_margin),
SelectableListLayout.getDefaultListItemLateralShadowSizePx(
view.getResources()));
@Override
protected BasicViewHolder createHeader(ViewGroup parent) {
if (mSpaceDisplay == null) {
mSpaceDisplay = new SpaceDisplay(parent, this);
registerAdapterDataObserver(mSpaceDisplay);
if (mUiConfig != null) {
MarginResizer.createAndAttach(mSpaceDisplay.getView(), mUiConfig,
parent.getResources().getDimensionPixelSize(
R.dimen.list_item_default_margin),
SelectableListLayout.getDefaultListItemLateralShadowSizePx(
parent.getResources()));
}
}
mSpaceDisplayHeaderItem = new HeaderItem(0, view);
mSpaceDisplay.onChanged();
return new BasicViewHolder(mSpaceDisplay.getView());
}
/** Called when a new DownloadItem has been created by the native DownloadManager. */
......@@ -606,7 +598,7 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
clear(false);
if (!filteredTimedItems.isEmpty() && !mIsSearching && mShouldShowStorageInfoHeader) {
setHeaders(mSpaceDisplayHeaderItem);
addHeader();
}
loadItems(filteredTimedItems);
......
chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerToolbar.java
View file @ 9676efc3
......@@ -24,20 +24,12 @@ import java.util.List;
public class DownloadManagerToolbar extends SelectableListToolbar<DownloadHistoryItemWrapper>
implements DownloadUiObserver {
private Spinner mSpinner;
private DownloadManagerUi mManager;
public DownloadManagerToolbar(Context context, AttributeSet attrs) {
super(context, attrs);
inflateMenu(R.menu.download_manager_menu);
}
/**
* @param manager The {@link DownloadManagerUi} associated with this toolbar.
*/
public void setManager(DownloadManagerUi manager) {
mManager = manager;
}
/**
* Initializes the spinner for the download filter.
* @param adapter The adapter associated with the spinner.
......@@ -103,12 +95,6 @@ public class DownloadManagerToolbar extends SelectableListToolbar<DownloadHistor
mSpinner.setAdapter(null);
}
@Override
protected void showNormalView() {
super.showNormalView();
mManager.updateInfoButtonVisibility();
}
@Override
public void showSearchView() {
super.showSearchView();
......
chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
View file @ 9676efc3
......@@ -9,7 +9,6 @@ import android.content.ComponentName;
import android.content.Intent;
import android.os.AsyncTask;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
import android.view.LayoutInflater;
......@@ -201,13 +200,6 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
// Prevent every progress update from causing a transition animation.
mRecyclerView.getItemAnimator().setChangeDuration(0);
mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
updateInfoButtonVisibility();
}
});
mFilterAdapter = new FilterAdapter();
mFilterAdapter.initialize(this);
addObserver(mFilterAdapter);
......@@ -215,7 +207,6 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
mToolbar = (DownloadManagerToolbar) mSelectableListLayout.initializeToolbar(
R.layout.download_manager_toolbar, mBackendProvider.getSelectionDelegate(), 0, null,
R.id.normal_menu_group, R.id.selection_mode_menu_group, null, this, true);
mToolbar.setManager(this);
mToolbar.initializeFilterSpinner(mFilterAdapter);
mToolbar.initializeSearchView(this, R.string.download_manager_search, R.id.search_menu_id);
mToolbar.setInfoMenuItem(R.id.info_menu_id);
......@@ -463,23 +454,6 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
mSnackbarManager.dismissSnackbars(mUndoDeletionSnackbarController);
}
/**
* @return True if info menu item should be shown on download toolbar, false otherwise.
*/
boolean shouldShowInfoButton() {
return mHistoryAdapter.getItemCount() > 0 && !mToolbar.isSearching();
}
/**
* Update info button visibility based on whether info header is visible on download page.
*/
void updateInfoButtonVisibility() {
LinearLayoutManager layoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
boolean infoHeaderIsVisible = layoutManager.findFirstVisibleItemPosition() == 0;
mToolbar.updateInfoMenuItem(infoHeaderIsVisible && shouldShowInfoButton(),
mHistoryAdapter.shouldShowStorageInfoHeader());
}
@VisibleForTesting
public SnackbarManager getSnackbarManagerForTesting() {
return mSnackbarManager;
......
chrome/android/java/src/org/chromium/chrome/browser/download/ui/SpaceDisplay.java
View file @ 9676efc3
......@@ -15,7 +15,6 @@ import android.view.ViewGroup;
import android.widget.TextView;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.ObserverList;
import org.chromium.base.VisibleForTesting;
......@@ -115,7 +114,7 @@ public class SpaceDisplay extends RecyclerView.AdapterDataObserver {
SpaceDisplay(final ViewGroup parent, DownloadHistoryAdapter historyAdapter) {
mHistoryAdapter = historyAdapter;
mView = LayoutInflater.from(ContextUtils.getApplicationContext())
mView = (ViewGroup) LayoutInflater.from(parent.getContext())
.inflate(R.layout.download_manager_ui_space_widget, parent, false);
mSpaceUsedByDownloadsTextView = (TextView) mView.findViewById(R.id.size_downloaded);
mSpaceUsedByOtherAppsTextView = (TextView) mView.findViewById(R.id.size_other_apps);
......
chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
View file @ 9676efc3
......@@ -134,23 +134,17 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
mLargeIconBridge.createCache(maxSize);
// 7. Initialize the adapter to load items.
mHistoryAdapter.generateHeaderItems();
mHistoryAdapter.initialize();
// 8. Add scroll listener to show/hide info button on scroll and page in more items
// when necessary.
// 8. Add scroll listener to page in more items when necessary.
mRecyclerView.addOnScrollListener(new OnScrollListener() {
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
LinearLayoutManager layoutManager =
(LinearLayoutManager) recyclerView.getLayoutManager();
// Show info button if available if first visible position is close to info header;
// otherwise hide info button.
mToolbar.updateInfoMenuItem(infoHeaderIsVisible() && shouldShowInfoButton(),
shouldShowInfoHeaderIfAvailable());
if (!mHistoryAdapter.canLoadMoreItems()) return;
// Load more items if the scroll position is close to the bottom of the list.
LinearLayoutManager layoutManager =
(LinearLayoutManager) recyclerView.getLayoutManager();
if (layoutManager.findLastVisibleItemPosition()
> (mHistoryAdapter.getItemCount() - 25)) {
mHistoryAdapter.loadMoreItems();
......@@ -420,8 +414,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
* @return True if info menu item should be shown on history toolbar, false otherwise.
*/
boolean shouldShowInfoButton() {
return mHistoryAdapter.hasPrivacyDisclaimers() && mHistoryAdapter.getItemCount() > 0
&& !mToolbar.isSearching();
return mHistoryAdapter.hasPrivacyDisclaimers();
}
/**
......@@ -432,14 +425,6 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
return mShouldShowInfoHeader;
}
/**
* @return True if info header is visible on history page.
*/
boolean infoHeaderIsVisible() {
LinearLayoutManager layoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
return (layoutManager.findFirstVisibleItemPosition() == 0);
}
@Override
public void onSignedIn() {
mToolbar.onSignInStateChange();
......
chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java
View file @ 9676efc3
......@@ -44,8 +44,8 @@ public class HistoryManagerToolbar extends SelectableListToolbar<HistoryItem> {
@Override
protected void showNormalView() {
super.showNormalView();
updateInfoMenuItem(mManager.infoHeaderIsVisible() && mManager.shouldShowInfoButton(),
mManager.shouldShowInfoHeaderIfAvailable());
updateInfoMenuItem(
mManager.shouldShowInfoButton(), mManager.shouldShowInfoHeaderIfAvailable());
}
@Override
......@@ -77,7 +77,9 @@ public class HistoryManagerToolbar extends SelectableListToolbar<HistoryItem> {
@Override
protected void onDataChanged(int numItems) {
super.onDataChanged(numItems);
getMenu().findItem(R.id.info_menu_id).setVisible(mManager.shouldShowInfoButton());
getMenu()
.findItem(R.id.info_menu_id)
.setVisible(mManager.shouldShowInfoButton() && !mIsSearching && numItems > 0);
}
/**
......
chrome/android/java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java
View file @ 9676efc3
......@@ -105,41 +105,6 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
public abstract long getStableId();
}
/**
* Contains information of a single header that this adapter uses to manage headers.
*/
public static class HeaderItem extends TimedItem {
private final long mStableId;
private final View mView;
/**
* Initialize stable id and view associated with this HeaderItem.
* @param position Position of this HeaderItem in the header group.
* @param view View associated with this HeaderItem.
*/
public HeaderItem(int position, View view) {
mStableId = getTimestamp() - position;
mView = view;
}
@Override
public long getTimestamp() {
return Long.MAX_VALUE;
}
@Override
public long getStableId() {
return mStableId;
}
/**
* @return The View associated with this HeaderItem.
*/
public View getView() {
return mView;
}
}
/**
* A {@link RecyclerView.ViewHolder} that displays a date header.
*/
......@@ -228,10 +193,6 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
mItems.remove(item);
}
public void removeAllItems() {
mItems.clear();
}
/** Records the position of all the TimedItems in this group, relative to the full list. */
public void setPosition(int index) {
assert mIndex == 0 || mIndex == TimedItem.INVALID_POSITION;
......@@ -264,18 +225,15 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
* @return The size of this group.
*/
public int size() {
if (mIsListHeader) return mItems.size();
if (mIsListFooter) return 1;
if (mIsListHeader || mIsListFooter) return 1;
// Plus 1 to account for the date header.
return mItems.size() + 1;
}
public TimedItem getItemAt(int index) {
// 0 is allocated to the date header. Return item if list header has
// header items, otherwise return null.
if (mIsListHeader) return mItems.get(index);
if (index <= 0 || mIsListFooter) return null;
// 0 is allocated to the date header. The list header has no items.
if (index <= 0 || mIsListHeader || mIsListFooter) return null;
sortIfNeeded();
return mItems.get(index - 1);
......@@ -347,15 +305,12 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
protected abstract ViewHolder createViewHolder(ViewGroup parent);
/**
* Creates a {@link BasicViewHolder} in the given view parent for the header. The default
* implementation will create an empty FrameLayout container as the view holder.
* Creates a {@link BasicViewHolder} in the given view parent for the header.
* @see #onCreateViewHolder(ViewGroup, int)
*/
@Nullable
protected BasicViewHolder createHeader(ViewGroup parent) {
// Create an empty layout as a container for the header view.
View v = LayoutInflater.from(parent.getContext())
.inflate(R.layout.date_divided_adapter_header_view_holder, parent, false);
return new BasicViewHolder(v);
return null;
}
/**
......@@ -407,18 +362,6 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
protected void bindViewHolderForSubsectionHeader(
SubsectionHeaderViewHolder holder, TimedItem timedItem) {}
/**
* Binds the {@link BasicViewHolder} with the given {@link HeaderItem}.
* @see #onBindViewHolder(ViewHolder, int)
*/
protected void bindViewHolderForHeaderItem(ViewHolder viewHolder, HeaderItem headerItem) {
BasicViewHolder basicViewHolder = (BasicViewHolder) viewHolder;
View v = headerItem.getView();
((ViewGroup) basicViewHolder.itemView).removeAllViews();
if (v.getParent() != null) ((ViewGroup) v.getParent()).removeView(v);
((ViewGroup) basicViewHolder.itemView).addView(v);
}
/**
* Gets the resource id of the view showing the date header.
* Contract for subclasses: this view should be a {@link TextView}.
......@@ -477,40 +420,17 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
}
/**
* Add a list of headers as the first group in this adapter. If headerItems has no items,
* the header group will not be created. Otherwise, header items will be added as child items
* to the header group. Note that any previously added header items will be removed.
* {@link #bindViewHolderForHeaderItem(ViewHolder, HeaderItem)} will bind the HeaderItem views
* to the given ViewHolder. Sub-classes may override #bindViewHolderForHeaderItem and
* (@link #createHeader(ViewGroup)} if custom behavior is needed.
*
* @param headerItems Zero or more header items to be add to the header item group.
* Adds a header as the first group in this adapter.
*/
public void setHeaders(HeaderItem... headerItems) {
if (headerItems == null || headerItems.length == 0) {
removeHeader();
return;
}
public void addHeader() {
assert mSize == 0;
ItemGroup header;
if (mHasListHeader) {
header = mGroups.first();
mSize -= header.size();
header.removeAllItems();
} else {
header = new ItemGroup(Long.MAX_VALUE);
header.mIsListHeader = true;
mGroups.add(header);
}
ItemGroup header = new ItemGroup(Long.MAX_VALUE);
header.mIsListHeader = true;
for (HeaderItem item : headerItems) {
header.addItem(item);
mSize++;
}
mGroups.add(header);
mSize++;
mHasListHeader = true;
setGroupPositions();
notifyDataSetChanged();
}
/**
......@@ -519,8 +439,8 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
public void removeHeader() {
if (!mHasListHeader) return;
mSize -= mGroups.first().size();
mGroups.remove(mGroups.first());
mSize--;
mHasListHeader = false;
setGroupPositions();
......@@ -590,8 +510,7 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
public Pair<Date, TimedItem> getItemAt(int position) {
Pair<ItemGroup, Integer> pair = getGroupAt(position);
ItemGroup group = pair.first;
return new Pair<>(group.mDate,
group.mIsListHeader ? group.getItemAt(position) : group.getItemAt(pair.second));
return new Pair<>(group.mDate, group.getItemAt(pair.second));
}
@Override
......@@ -637,8 +556,6 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
bindViewHolderForSubsectionHeader((SubsectionHeaderViewHolder) holder, pair.second);
} else if (!(holder instanceof BasicViewHolder)) {
bindViewHolderForTimedItem(holder, pair.second);
} else if (pair.second instanceof HeaderItem) {
bindViewHolderForHeaderItem(holder, (HeaderItem) pair.second);
}
}
......@@ -652,7 +569,7 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
*/
protected Pair<ItemGroup, Integer> getGroupAt(int position) {
// TODO(ianwen): Optimize the performance if the number of groups becomes too large.
if (mHasListHeader && position < mGroups.first().size()) {
if (mHasListHeader && position == 0) {
assert mGroups.first().mIsListHeader;
return new Pair<>(mGroups.first(), TYPE_HEADER);
}
......
chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java
View file @ 9676efc3
......@@ -34,7 +34,6 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.signin.SigninManager;
import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
import org.chromium.chrome.browser.widget.DateDividedAdapter;
import org.chromium.chrome.browser.widget.TintedImageButton;
import org.chromium.chrome.browser.widget.selection.SelectableItemView;
import org.chromium.chrome.browser.widget.selection.SelectableItemViewHolder;
......@@ -443,10 +442,11 @@ public class HistoryActivityTest extends BaseActivityInstrumentationTestCase<His
// Not signed in
ChromeSigninController signinController = ChromeSigninController.get();
signinController.setSignedInAccountName(null);
assertFalse(infoMenuItem.isVisible());
DateDividedAdapter.ItemGroup headerGroup = mAdapter.getFirstGroupForTests();
assertTrue(mAdapter.hasListHeader());
assertEquals(1, headerGroup.size());
assertEquals(false, infoMenuItem.isVisible());
assertEquals(View.GONE, mAdapter.getSignedInNotSyncedViewForTests().getVisibility());
assertEquals(View.GONE, mAdapter.getSignedInSyncedViewForTests().getVisibility());
assertEquals(
View.GONE, mAdapter.getOtherFormsOfBrowsingHistoryViewForTests().getVisibility());
// Signed in but not synced and history has items
signinController.setSignedInAccountName("test@gmail.com");
......@@ -457,100 +457,22 @@ public class HistoryActivityTest extends BaseActivityInstrumentationTestCase<His
toolbar.onSignInStateChange();
}
});
assertTrue(infoMenuItem.isVisible());
assertEquals(true, infoMenuItem.isVisible());
// Signed in, synced, has other forms and has items
// Privacy disclaimers should be shown by default
setHasOtherFormsOfBrowsingData(true, true);
assertTrue(infoMenuItem.isVisible());
headerGroup = mAdapter.getFirstGroupForTests();
assertTrue(mAdapter.hasListHeader());
assertEquals(2, headerGroup.size());
assertEquals(true, infoMenuItem.isVisible());
assertEquals(View.VISIBLE, mAdapter.getPrivacyDisclaimersForTests().getVisibility());
// Toggle Info Menu Item to off
// Toggle Info Menu Item
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
mHistoryManager.onMenuItemClick(infoMenuItem);
}
});
headerGroup = mAdapter.getFirstGroupForTests();
assertTrue(mAdapter.hasListHeader());
assertEquals(1, headerGroup.size());
// Toggle Info Menu Item to on
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
mHistoryManager.onMenuItemClick(infoMenuItem);
}
});
headerGroup = mAdapter.getFirstGroupForTests();
assertTrue(mAdapter.hasListHeader());
assertEquals(2, headerGroup.size());
signinController.setSignedInAccountName(null);
}
@SmallTest
public void testInfoHeaderInSearchMode() throws Exception {
final HistoryManagerToolbar toolbar = mHistoryManager.getToolbarForTests();
final MenuItem infoMenuItem = toolbar.getItemById(R.id.info_menu_id);
// Sign in
int callCount = mTestObserver.onSelectionCallback.getCallCount();
ChromeSigninController signinController = ChromeSigninController.get();
signinController.setSignedInAccountName("test@gmail.com");
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
toolbar.onSignInStateChange();
mAdapter.onSignInStateChange();
}
});
mTestObserver.onChangedCallback.waitForCallback(callCount, 1);
DateDividedAdapter.ItemGroup firstGroup = mAdapter.getFirstGroupForTests();
assertTrue(infoMenuItem.isVisible());
assertTrue(mAdapter.hasListHeader());
assertEquals(2, firstGroup.size());
// Enter search mode
callCount = mTestObserver.onSelectionCallback.getCallCount();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
toolbar.getMenu().performIdentifierAction(R.id.search_menu_id, 0);
}
});
mTestObserver.onSelectionCallback.waitForCallback(callCount, 1);
firstGroup = mAdapter.getFirstGroupForTests();
assertFalse(infoMenuItem.isVisible());
// The first group should be the history item group from SetUp()
assertFalse(mAdapter.hasListHeader());
assertEquals(3, firstGroup.size());
signinController.setSignedInAccountName(null);
}
@SmallTest
public void testInvisibleHeader() throws Exception {
assertTrue(mAdapter.hasListHeader());
// Not sign in and set clear browsing data button to invisible
ChromeSigninController signinController = ChromeSigninController.get();
signinController.setSignedInAccountName(null);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
mAdapter.setClearBrowsingDataButtonVisibilityForTest(false);
mAdapter.setPrivacyDisclaimerVisibility();
}
});
DateDividedAdapter.ItemGroup firstGroup = mAdapter.getFirstGroupForTests();
assertFalse(mAdapter.hasListHeader());
assertEquals(3, firstGroup.size());
assertEquals(View.GONE, mAdapter.getPrivacyDisclaimersForTests().getVisibility());
}
@SmallTest
......
chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryAdapterTest.java
View file @ 9676efc3
......@@ -36,7 +36,6 @@ public class HistoryAdapterTest {
public void setUp() throws Exception {
mHistoryProvider = new StubbedHistoryProvider();
mAdapter = new HistoryAdapter(new SelectionDelegate<HistoryItem>(), null, mHistoryProvider);
mAdapter.generateHeaderItemsForTest();
}
private void initializeAdapter() {
......
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