Fix UI behavior on saved pages
The UI on saved pages will now
behave correctly. Title bar and
overflow menu will work as expected.
CR-Fix: SWE-6355
Change-Id: I53a3fc595950bdcf0cf2262457922c934479996d
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index f692434..f8a2337 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -44,7 +44,7 @@
<ImageView
android:id="@+id/titleBar_dropShadow"
android:layout_width="match_parent"
- android:layout_height="6dp"
+ android:layout_height="@dimen/dropshadow_height"
android:scaleType="fitXY"
android:src="@drawable/img_deco_dropshadow" />
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 4853179..83e161a 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -73,6 +73,7 @@
<dimen name="nav_tab_text_small">14sp</dimen>
<dimen name="suggest_item_padding">8dp</dimen>
<dimen name="progress_bar_margin">-18dip</dimen>
+ <dimen name="dropshadow_height">6dip</dimen>
<!-- Custom Menu dimensions -->
<dimen name="menu_negative_software_vertical_offset">0dp</dimen>
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 5934fe1..c2e6050 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -906,15 +906,16 @@
mTitleBar.setEnabled(true);
}
float currentY = mTitleBar.getTranslationY();
- float height = mNavigationBar.getHeight();
+ float height = mTitleBar.getHeight();
+ float shadowHeight = mActivity.getResources().getDimension(R.dimen.dropshadow_height);
+ height -= shadowHeight; //this is the height of the titlebar without the shadow
if ((height + currentY) <= 0 && (height + topControlsOffsetYPix) > 0) {
mTitleBar.requestLayout();
} else if ((height + topControlsOffsetYPix) <= 0) {
// Need to add the progress bar's margin to the offest since it's height is not
// accounted for and the dropshadow draws inside it.
- topControlsOffsetYPix +=
- mActivity.getResources().getDimension(R.dimen.progress_bar_margin);
+ topControlsOffsetYPix -= shadowHeight;
mTitleBar.getParent().requestTransparentRegion(mTitleBar);
}
// This was done to get HTML5 fullscreen API to work with fixed mode since
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 454b25a..d8953a2 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1903,7 +1903,11 @@
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// Software menu key (toolbar key)
- mAppMenuHandler.showAppMenu(mActivity.findViewById(R.id.more_browser_settings), false, false);
+ View overflowMenu = mActivity.findViewById(R.id.more_browser_settings);
+ if (getCurrentTab() != null && getCurrentTab().isSnapshot()) {
+ overflowMenu = mActivity.findViewById(R.id.more);
+ }
+ mAppMenuHandler.showAppMenu(overflowMenu, false, false);
return true;
}