| OLD | NEW | 
|---|
| 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.graphics.Bitmap; | 8 import android.graphics.Bitmap; | 
| 9 import android.graphics.Canvas; | 9 import android.graphics.Canvas; | 
| 10 import android.graphics.Paint; | 10 import android.graphics.Paint; | 
| 11 import android.graphics.Rect; | 11 import android.graphics.Rect; | 
| 12 import android.graphics.RectF; | 12 import android.graphics.RectF; | 
| 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.widget.BottomSheet; | 21 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; | 
| 22 import org.chromium.chrome.browser.widget.BottomSheetObserver; | 22 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver; | 
| 23 | 23 | 
| 24 /** | 24 /** | 
| 25  * Phone specific toolbar that exists at the bottom of the screen. | 25  * Phone specific toolbar that exists at the bottom of the screen. | 
| 26  */ | 26  */ | 
| 27 public class BottomToolbarPhone extends ToolbarPhone implements BottomSheetObser
     ver { | 27 public class BottomToolbarPhone extends ToolbarPhone implements BottomSheetObser
     ver { | 
| 28     /** The white version of the toolbar handle; used for dark themes and incogn
     ito. */ | 28     /** The white version of the toolbar handle; used for dark themes and incogn
     ito. */ | 
| 29     private final Bitmap mHandleLight; | 29     private final Bitmap mHandleLight; | 
| 30 | 30 | 
| 31     /** The dark version of the toolbar handle; this is the default handle to us
     e. */ | 31     /** The dark version of the toolbar handle; this is the default handle to us
     e. */ | 
| 32     private final Bitmap mHandleDark; | 32     private final Bitmap mHandleDark; | 
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 249         otherToolbar.setTitleTextAppearance( | 249         otherToolbar.setTitleTextAppearance( | 
| 250                 otherToolbar.getContext(), R.style.BottomSheetContentTitle); | 250                 otherToolbar.getContext(), R.style.BottomSheetContentTitle); | 
| 251         ApiCompatibilityUtils.setPaddingRelative(otherToolbar, | 251         ApiCompatibilityUtils.setPaddingRelative(otherToolbar, | 
| 252                 ApiCompatibilityUtils.getPaddingStart(otherToolbar), | 252                 ApiCompatibilityUtils.getPaddingStart(otherToolbar), | 
| 253                 otherToolbar.getPaddingTop() + extraTopMargin, | 253                 otherToolbar.getPaddingTop() + extraTopMargin, | 
| 254                 ApiCompatibilityUtils.getPaddingEnd(otherToolbar), otherToolbar.
     getPaddingBottom()); | 254                 ApiCompatibilityUtils.getPaddingEnd(otherToolbar), otherToolbar.
     getPaddingBottom()); | 
| 255 | 255 | 
| 256         otherToolbar.requestLayout(); | 256         otherToolbar.requestLayout(); | 
| 257     } | 257     } | 
| 258 } | 258 } | 
| OLD | NEW | 
|---|