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

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

Issue 2738843003: [Home] Add a bottom navigation bar for the BottomSheet (Closed)
Patch Set: Move proguard exception to different file Created 3 years, 9 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 e1dc768181543976cbd34ac4cdb7aab6bec8785e..48f6a1a7d0cb5da8d7dfdaff9376fe5d5401cb2a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -136,6 +136,7 @@ import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
import org.chromium.chrome.browser.webapps.AddToHomescreenManager;
import org.chromium.chrome.browser.widget.BottomSheet;
+import org.chromium.chrome.browser.widget.BottomSheetContentController;
import org.chromium.chrome.browser.widget.ControlContainer;
import org.chromium.chrome.browser.widget.EmptyBottomSheetObserver;
import org.chromium.chrome.browser.widget.FadingBackgroundView;
@@ -368,6 +369,13 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
}
});
mFadingBackgroundView.addObserver(mBottomSheet);
+
+ BottomSheetContentController contentController =
+ (BottomSheetContentController) ((ViewStub) findViewById(R.id.bottom_nav_stub))
+ .inflate();
+ int controlContainerHeight =
+ ((ControlContainer) findViewById(R.id.control_container)).getView().getHeight();
+ contentController.init(mBottomSheet, controlContainerHeight);
}
((BottomContainer) findViewById(R.id.bottom_container)).initialize(mFullscreenManager);
}
« no previous file with comments | « chrome/android/java/res/values/dimens.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698