Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

Issue 2854643002: [Android] Width constrain bookmarks and downloads UIs (Closed)
Patch Set: Changes from dfalcantara@ review Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.bookmarks; 5 package org.chromium.chrome.browser.bookmarks;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.app.ActivityManager; 8 import android.app.ActivityManager;
9 import android.content.Context; 9 import android.content.Context;
10 import android.support.graphics.drawable.VectorDrawableCompat; 10 import android.support.graphics.drawable.VectorDrawableCompat;
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 VectorDrawableCompat.create( 142 VectorDrawableCompat.create(
143 mActivity.getResources(), R.drawable.bookmark_big, mActi vity.getTheme()), 143 mActivity.getResources(), R.drawable.bookmark_big, mActi vity.getTheme()),
144 R.string.bookmarks_folder_empty, R.string.bookmark_no_result); 144 R.string.bookmarks_folder_empty, R.string.bookmark_no_result);
145 145
146 mAdapter = new BookmarkItemsAdapter(activity); 146 mAdapter = new BookmarkItemsAdapter(activity);
147 147
148 mRecyclerView = mSelectableListLayout.initializeRecyclerView(mAdapter); 148 mRecyclerView = mSelectableListLayout.initializeRecyclerView(mAdapter);
149 149
150 mToolbar = (BookmarkActionBar) mSelectableListLayout.initializeToolbar( 150 mToolbar = (BookmarkActionBar) mSelectableListLayout.initializeToolbar(
151 R.layout.bookmark_action_bar, mSelectionDelegate, 0, null, R.id. normal_menu_group, 151 R.layout.bookmark_action_bar, mSelectionDelegate, 0, null, R.id. normal_menu_group,
152 R.id.selection_mode_menu_group, R.color.default_primary_color, f alse, null); 152 R.id.selection_mode_menu_group, R.color.default_primary_color, n ull);
153 mToolbar.initializeSearchView( 153 mToolbar.initializeSearchView(
154 this, R.string.bookmark_action_bar_search, R.id.search_menu_id); 154 this, R.string.bookmark_action_bar_search, R.id.search_menu_id);
155 155
156 mSelectableListLayout.configureWideDisplayStyle();
157
156 mUndoController = new BookmarkUndoController(activity, mBookmarkModel, s nackbarManager); 158 mUndoController = new BookmarkUndoController(activity, mBookmarkModel, s nackbarManager);
157 mBookmarkModel.addObserver(mBookmarkModelObserver); 159 mBookmarkModel.addObserver(mBookmarkModelObserver);
158 initializeToLoadingState(); 160 initializeToLoadingState();
159 mBookmarkModel.runAfterBookmarkModelLoaded(mModelLoadedRunnable); 161 mBookmarkModel.runAfterBookmarkModelLoaded(mModelLoadedRunnable);
160 162
161 // Load partner bookmarks explicitly. We load partner bookmarks in the d eferred startup 163 // Load partner bookmarks explicitly. We load partner bookmarks in the d eferred startup
162 // code, but that might be executed much later. Especially on L, showing loading 164 // code, but that might be executed much later. Especially on L, showing loading
163 // progress bar blocks that so it won't be loaded. http://crbug.com/4293 83 165 // progress bar blocks that so it won't be loaded. http://crbug.com/4293 83
164 PartnerBookmarksShim.kickOffReading(activity); 166 PartnerBookmarksShim.kickOffReading(activity);
165 167
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 return false; 225 return false;
224 } 226 }
225 227
226 public View getView() { 228 public View getView() {
227 return mMainView; 229 return mMainView;
228 } 230 }
229 231
230 /** 232 /**
231 * See {@link SelectableListLayout#detachToolbarView()}. 233 * See {@link SelectableListLayout#detachToolbarView()}.
232 */ 234 */
233 public SelectableListToolbar detachToolbarView() { 235 public SelectableListToolbar<BookmarkId> detachToolbarView() {
234 return mSelectableListLayout.detachToolbarView(); 236 return mSelectableListLayout.detachToolbarView();
235 } 237 }
236 238
237 /** 239 /**
238 * @return The vertical scroll offset of the content view. 240 * @return The vertical scroll offset of the content view.
239 */ 241 */
240 public int getVerticalScrollOffset() { 242 public int getVerticalScrollOffset() {
241 return mRecyclerView.computeVerticalScrollOffset(); 243 return mRecyclerView.computeVerticalScrollOffset();
242 } 244 }
243 245
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 setState(BookmarkUIState.createFolderState(folder, mBookmarkModel)); 347 setState(BookmarkUIState.createFolderState(folder, mBookmarkModel));
346 mRecyclerView.scrollToPosition(0); 348 mRecyclerView.scrollToPosition(0);
347 } 349 }
348 350
349 @Override 351 @Override
350 public SelectionDelegate<BookmarkId> getSelectionDelegate() { 352 public SelectionDelegate<BookmarkId> getSelectionDelegate() {
351 return mSelectionDelegate; 353 return mSelectionDelegate;
352 } 354 }
353 355
354 @Override 356 @Override
357 public SelectableListLayout<BookmarkId> getSelectableListLayout() {
358 return mSelectableListLayout;
359 }
360
361 @Override
355 public void notifyStateChange(BookmarkUIObserver observer) { 362 public void notifyStateChange(BookmarkUIObserver observer) {
356 int state = getCurrentState(); 363 int state = getCurrentState();
357 switch (state) { 364 switch (state) {
358 case BookmarkUIState.STATE_FOLDER: 365 case BookmarkUIState.STATE_FOLDER:
359 observer.onFolderStateSet(mStateStack.peek().mFolder); 366 observer.onFolderStateSet(mStateStack.peek().mFolder);
360 break; 367 break;
361 case BookmarkUIState.STATE_LOADING: 368 case BookmarkUIState.STATE_LOADING:
362 // In loading state, onBookmarkDelegateInitialized() is not call ed for all 369 // In loading state, onBookmarkDelegateInitialized() is not call ed for all
363 // UIObservers, which means that there will be no observers at t he time. Do nothing. 370 // UIObservers, which means that there will be no observers at t he time. Do nothing.
364 assert mUIObservers.isEmpty(); 371 assert mUIObservers.isEmpty();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 closeSearchUI(); 446 closeSearchUI();
440 } 447 }
441 448
442 // Testing methods 449 // Testing methods
443 450
444 @VisibleForTesting 451 @VisibleForTesting
445 public BookmarkActionBar getToolbarForTests() { 452 public BookmarkActionBar getToolbarForTests() {
446 return mToolbar; 453 return mToolbar;
447 } 454 }
448 } 455 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698