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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Issue 2625923002: Introduce the bottom sheet class for Chrome Home (Closed)
Patch Set: fix findbugs Created 3 years, 11 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/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index cbe92b54be1300b6dede26246975b74711c82e41..c3d44906522197779a5eea376b5b8b7f6c03e4a2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -22,11 +22,9 @@ import android.os.Build;
import android.os.Bundle;
import android.os.StrictMode;
import android.os.SystemClock;
-import android.support.design.widget.CoordinatorLayout.LayoutParams;
import android.support.v7.app.AlertDialog;
import android.util.DisplayMetrics;
import android.util.Pair;
-import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -127,6 +125,7 @@ import org.chromium.chrome.browser.util.ChromeFileProvider;
import org.chromium.chrome.browser.util.ColorUtils;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.browser.webapps.AddToHomescreenManager;
+import org.chromium.chrome.browser.widget.BottomSheet;
import org.chromium.chrome.browser.widget.ControlContainer;
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.content.browser.ContentVideoView;
@@ -380,13 +379,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
toolbarContainerStub.setLayoutResource(controlContainerLayoutId);
View container = toolbarContainerStub.inflate();
-
- // If the control container is at the bottom apply Gravity.BOTTOM here since
- // it is not respected in the XML while the ViewStub in between the
- // CompositorViewHolder and ControlContainer.
- if (controlContainerLayoutId == R.layout.bottom_control_container) {
- ((LayoutParams) container.getLayoutParams()).gravity = Gravity.BOTTOM;
- }
}
// It cannot be assumed that the result of toolbarContainerStub.inflate() will be
@@ -394,6 +386,13 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
ControlContainer controlContainer =
(ControlContainer) findViewById(R.id.control_container);
+ // Get a handle to the bottom sheet if using the bottom control container.
+ if (controlContainerLayoutId == R.layout.bottom_control_container) {
+ View coordinator = findViewById(R.id.coordinator);
+ BottomSheet bottomSheet = (BottomSheet) findViewById(R.id.bottom_sheet);
+ bottomSheet.init(coordinator, controlContainer.getView());
+ }
+
// Inflate the correct toolbar layout for the device.
int toolbarLayoutId = getToolbarLayoutId();
if (toolbarLayoutId != NO_TOOLBAR_LAYOUT && controlContainer != null) {

Powered by Google App Engine
This is Rietveld 408576698