diff options
author | Sagar Dhawan <sdhawan@codeaurora.org> | 2016-01-04 17:58:02 -0800 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2016-01-11 22:03:28 +0100 |
commit | 7fa896213d56e59dcec2a1a5096d07fff17398f7 (patch) | |
tree | 47384332fd77deaa178d02770f8d83b4e685f563 | |
parent | 4ab271d9c27070ac1972fef858dc8f0af06b3e0c (diff) | |
download | android_packages_apps_Gello-7fa896213d56e59dcec2a1a5096d07fff17398f7.tar.gz android_packages_apps_Gello-7fa896213d56e59dcec2a1a5096d07fff17398f7.tar.bz2 android_packages_apps_Gello-7fa896213d56e59dcec2a1a5096d07fff17398f7.zip |
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
-rw-r--r-- | res/layout/title_bar.xml | 2 | ||||
-rwxr-xr-x | res/values/dimensions.xml | 1 | ||||
-rw-r--r-- | src/com/android/browser/BaseUi.java | 7 | ||||
-rw-r--r-- | src/com/android/browser/Controller.java | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index f692434b..f8a23376 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 4853179c..83e161a4 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 5934fe1b..c2e6050e 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -906,15 +906,16 @@ public abstract class BaseUi implements UI { 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 454b25a8..d8953a25 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1903,7 +1903,11 @@ public class Controller @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; } |