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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java

Issue 2833573002: 🏠 Allow bottom sheet content to update handle color (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
index 74c59806b5058e12681cbb0fd92e2b1652d09dcc..5b6cfe0398d41cfcaad2f76582133e5418150768 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
@@ -32,6 +32,7 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.widget.NumberRollView;
import org.chromium.chrome.browser.widget.TintedDrawable;
import org.chromium.chrome.browser.widget.TintedImageButton;
+import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
import org.chromium.chrome.browser.widget.displaystyle.DisplayStyleObserver;
import org.chromium.chrome.browser.widget.displaystyle.HorizontalDisplayStyle;
import org.chromium.chrome.browser.widget.displaystyle.UiConfig;
@@ -81,11 +82,14 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
protected SelectionDelegate<E> mSelectionDelegate;
protected boolean mIsSearching;
+ private BottomSheet mBottomSheet;
+
private boolean mHasSearchView;
private LinearLayout mSearchView;
private EditText mSearchEditText;
private TintedImageButton mClearTextButton;
private SearchDelegate mSearchDelegate;
+ private boolean mIsLightTheme;
protected NumberRollView mNumberRollView;
private DrawerLayout mDrawerLayout;
@@ -483,6 +487,20 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
}
/**
+ * @param sheet The {@link BottomSheet} for Chrome Home if it exists.
+ */
+ public void setBottomSheet(BottomSheet sheet) {
+ mBottomSheet = sheet;
+ }
+
+ /**
+ * @return Whether or not the toolbar is currently using a light theme.
+ */
+ public boolean isLightTheme() {
+ return mIsLightTheme;
+ }
+
+ /**
* Set up ActionBarDrawerToggle, a.k.a. hamburger button.
*/
private void initActionBarDrawerToggle() {
@@ -509,6 +527,7 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
mNumberRollView.setVisibility(View.GONE);
mNumberRollView.setNumber(0, false);
+ mIsLightTheme = false;
updateDisplayStyleIfNecessary();
}
@@ -528,6 +547,7 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
if (mIsSearching) UiUtils.hideKeyboard(mSearchEditText);
+ mIsLightTheme = true;
updateDisplayStyleIfNecessary();
}
@@ -539,10 +559,12 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
setNavigationButton(NAVIGATION_BUTTON_BACK);
setBackgroundColor(mSearchBackgroundColor);
+ mIsLightTheme = false;
updateDisplayStyleIfNecessary();
}
private void updateDisplayStyleIfNecessary() {
+ if (mBottomSheet != null) mBottomSheet.updateHandleTint();
if (mUiConfig != null) onDisplayStyleChanged(mUiConfig.getCurrentDisplayStyle());
}

Powered by Google App Engine
This is Rietveld 408576698