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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java

Issue 2876093002: [Home] Placeholder sheet content for omnibox focus (Closed)
Patch Set: address comments 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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.toolbar; 5 package org.chromium.chrome.browser.toolbar;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.content.res.ColorStateList; 8 import android.content.res.ColorStateList;
9 import android.graphics.Canvas; 9 import android.graphics.Canvas;
10 import android.graphics.Rect; 10 import android.graphics.Rect;
11 import android.graphics.drawable.Drawable; 11 import android.graphics.drawable.Drawable;
12 import android.os.SystemClock; 12 import android.os.SystemClock;
13 import android.support.v7.widget.Toolbar; 13 import android.support.v7.widget.Toolbar;
14 import android.util.AttributeSet; 14 import android.util.AttributeSet;
15 import android.view.View; 15 import android.view.View;
16 import android.view.ViewGroup; 16 import android.view.ViewGroup;
17 import android.widget.ImageView; 17 import android.widget.ImageView;
18 18
19 import org.chromium.base.ApiCompatibilityUtils; 19 import org.chromium.base.ApiCompatibilityUtils;
20 import org.chromium.chrome.R; 20 import org.chromium.chrome.R;
21 import org.chromium.chrome.browser.device.DeviceClassManager; 21 import org.chromium.chrome.browser.device.DeviceClassManager;
22 import org.chromium.chrome.browser.tab.Tab;
22 import org.chromium.chrome.browser.util.ColorUtils; 23 import org.chromium.chrome.browser.util.ColorUtils;
23 import org.chromium.chrome.browser.util.FeatureUtilities; 24 import org.chromium.chrome.browser.util.FeatureUtilities;
24 import org.chromium.chrome.browser.widget.TintedImageButton; 25 import org.chromium.chrome.browser.widget.TintedImageButton;
25 import org.chromium.chrome.browser.widget.ToolbarProgressBar; 26 import org.chromium.chrome.browser.widget.ToolbarProgressBar;
26 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; 27 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
27 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetMetrics; 28 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetMetrics;
28 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver; 29 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver;
29 import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver; 30 import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver;
30 31
31 /** 32 /**
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 return getResources().getDimensionPixelSize(R.dimen.chrome_home_progress _bar_height); 176 return getResources().getDimensionPixelSize(R.dimen.chrome_home_progress _bar_height);
176 } 177 }
177 178
178 @Override 179 @Override
179 protected ToolbarProgressBar createProgressBar() { 180 protected ToolbarProgressBar createProgressBar() {
180 return new ToolbarProgressBar( 181 return new ToolbarProgressBar(
181 getContext(), getProgressBarHeight(), getProgressBarTopMargin(), true); 182 getContext(), getProgressBarHeight(), getProgressBarTopMargin(), true);
182 } 183 }
183 184
184 @Override 185 @Override
186 public void onUrlFocusChange(boolean hasFocus) {
187 Tab currentTab = getToolbarDataProvider().getTab();
188 if (currentTab != null) {
189 currentTab.getActivity().getBottomSheetContentController().onOmnibox FocusChange(
190 hasFocus);
191 }
192
193 super.onUrlFocusChange(hasFocus);
194 }
195
196 @Override
185 protected void triggerUrlFocusAnimation(final boolean hasFocus) { 197 protected void triggerUrlFocusAnimation(final boolean hasFocus) {
186 super.triggerUrlFocusAnimation(hasFocus); 198 super.triggerUrlFocusAnimation(hasFocus);
187 199
188 if (mBottomSheet == null || !hasFocus) return; 200 if (mBottomSheet == null || !hasFocus) return;
189 201
190 boolean wasSheetOpen = mBottomSheet.isSheetOpen(); 202 boolean wasSheetOpen = mBottomSheet.isSheetOpen();
191 mBottomSheet.setSheetState(BottomSheet.SHEET_STATE_FULL, true); 203 mBottomSheet.setSheetState(BottomSheet.SHEET_STATE_FULL, true);
192 204
193 if (!wasSheetOpen) { 205 if (!wasSheetOpen) {
194 mBottomSheet.getBottomSheetMetrics().recordSheetOpenReason( 206 mBottomSheet.getBottomSheetMetrics().recordSheetOpenReason(
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 otherToolbar.setTitleTextAppearance( 468 otherToolbar.setTitleTextAppearance(
457 otherToolbar.getContext(), R.style.BottomSheetContentTitle); 469 otherToolbar.getContext(), R.style.BottomSheetContentTitle);
458 ApiCompatibilityUtils.setPaddingRelative(otherToolbar, 470 ApiCompatibilityUtils.setPaddingRelative(otherToolbar,
459 ApiCompatibilityUtils.getPaddingStart(otherToolbar), 471 ApiCompatibilityUtils.getPaddingStart(otherToolbar),
460 otherToolbar.getPaddingTop() + extraTopMargin, 472 otherToolbar.getPaddingTop() + extraTopMargin,
461 ApiCompatibilityUtils.getPaddingEnd(otherToolbar), otherToolbar. getPaddingBottom()); 473 ApiCompatibilityUtils.getPaddingEnd(otherToolbar), otherToolbar. getPaddingBottom());
462 474
463 otherToolbar.requestLayout(); 475 otherToolbar.requestLayout();
464 } 476 }
465 } 477 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698