Auto hide URL bar.
- Implement URLbar hide on onOffsetsForFullscreenChanged
notiication from the engine.
-Reverted
"Fix for disappearing title bar caused by copy/paste control"
Change-Id: I19860bd9356b2dc392539aa1e16819545e32de6d"
Change-Id: Ie8547e9a7ca7dfc892a94c5632a7fddddef58cc3
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index ddc5ad2..4648de7 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -830,17 +830,43 @@
setFullscreen(enabled);
FrameLayout main = (FrameLayout) mActivity.getWindow()
.getDecorView().findViewById(android.R.id.content);
-
+ boolean hide_title_on_scroll =
+ mActivity.getResources().getBoolean(R.bool.hide_title_on_scroll);
LinearLayout titleBarParent = (LinearLayout) main.findViewById(R.id.vertical_layout);
if (titleBarParent != null) {
if (enabled) {
- titleBarParent.removeView(mFixedTitlebarContainer);
+ if (!hide_title_on_scroll) {
+ titleBarParent.removeView(mFixedTitlebarContainer);
+ }
+ else {
+ mContentView.removeView(mTitleBar);
+ }
} else {
- titleBarParent.addView(mFixedTitlebarContainer, 1);
+ if (!hide_title_on_scroll) {
+ titleBarParent.addView(mFixedTitlebarContainer, 1);
+ }
+ else {
+ mContentView.addView(mTitleBar,
+ new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+ LayoutParams.WRAP_CONTENT));
+ }
}
}
}
+ public void transalateTitleBar(float topControlsOffsetYPix) {
+ if (mTitleBar != null) {
+ mTitleBar.bringToFront();
+ if (topControlsOffsetYPix != 0.0) {
+ mTitleBar.setEnabled(false);
+ } else {
+ mTitleBar.setEnabled(true);
+ }
+ mTitleBar.setTranslationY(topControlsOffsetYPix);
+
+ }
+ }
+
public Drawable getFaviconDrawable(Bitmap icon) {
Drawable[] array = new Drawable[3];
array[0] = new PaintDrawable(Color.BLACK);
@@ -944,14 +970,22 @@
@Override
public void onActionModeStarted(ActionMode mode) {
- int fixedTbarHeight = mTitleBar.isFixed() ? mTitleBar.calculateEmbeddedHeight() : 0;
- mFixedTitlebarContainer.setY(fixedTbarHeight);
- setContentViewMarginTop(fixedTbarHeight);
+ boolean hide_title_on_scroll =
+ mActivity.getResources().getBoolean(R.bool.hide_title_on_scroll);
+ if (!hide_title_on_scroll) {
+ int fixedTbarHeight = mTitleBar.isFixed() ? mTitleBar.calculateEmbeddedHeight() : 0;
+ mFixedTitlebarContainer.setY(fixedTbarHeight);
+ setContentViewMarginTop(fixedTbarHeight);
+ }
}
@Override
public void onActionModeFinished(boolean inLoad) {
- mFixedTitlebarContainer.setY(0);
- setContentViewMarginTop(0);
+ boolean hide_title_on_scroll =
+ mActivity.getResources().getBoolean(R.bool.hide_title_on_scroll);
+ if (!hide_title_on_scroll) {
+ mFixedTitlebarContainer.setY(0);
+ setContentViewMarginTop(0);
+ }
}
}