diff options
author | Vivek Sekhar <vsekhar@codeaurora.org> | 2015-04-02 21:00:48 -0700 |
---|---|---|
committer | WebTech Code Review <code-review@localhost> | 2015-04-03 15:20:11 -0700 |
commit | e337acf899b15687bc48d062148a099749999b9a (patch) | |
tree | 43c87a3409bf64453b857216480870d9c96c95f2 | |
parent | 953d16e4ec4d59e44022de473438c85c05cbc052 (diff) | |
download | android_packages_apps_Gello-e337acf899b15687bc48d062148a099749999b9a.tar.gz android_packages_apps_Gello-e337acf899b15687bc48d062148a099749999b9a.tar.bz2 android_packages_apps_Gello-e337acf899b15687bc48d062148a099749999b9a.zip |
Unify top controls calls to TitleBar
Change-Id: I71554e502c9543d44350a76218fd5052ee683cac
-rw-r--r-- | src/com/android/browser/BaseUi.java | 6 | ||||
-rw-r--r-- | src/com/android/browser/TitleBar.java | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index cf758099..fbaaad1d 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -816,13 +816,13 @@ public abstract class BaseUi implements UI { if (getWebView() != null) { if (fullScreen) { //hide topbar - getWebView().updateTopControls(true, false, false); + mTitleBar.hideTopControls(true); } else { //show the topbar - getWebView().updateTopControls(false, true, false); + mTitleBar.showTopControls(true); //enable for auto-hide if (!mTitleBar.isFixed()) - getWebView().updateTopControls(true, true, false); + mTitleBar.enableTopControls(true); } } } diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index 11a31284..357da3c9 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -182,9 +182,9 @@ public class TitleBar extends FrameLayout implements ViewTreeObserver.OnPreDrawL this.setTranslationY(0); // reaffirm top-controls if (isFixed() || isInLoad()) - showTopControls(); + showTopControls(false); else - enableTopControls(); + enableTopControls(true); } else if (!bOldStyleAutoHideDisabled) { int visibleHeight = getVisibleTitleHeight(); float startPos = (-getEmbeddedHeight() + visibleHeight); @@ -259,25 +259,25 @@ public class TitleBar extends FrameLayout implements ViewTreeObserver.OnPreDrawL return webview != null ? webview.getVisibleTitleHeight() : 0; } - private void hideTopControls() { + protected void hideTopControls(boolean animate) { Tab tab = mBaseUi.getActiveTab(); WebView view = tab != null ? tab.getWebView() : null; if (view != null) - view.updateTopControls(true, false, true); + view.updateTopControls(true, false, animate); } - private void showTopControls() { + protected void showTopControls(boolean animate) { Tab tab = mBaseUi.getActiveTab(); WebView view = tab != null ? tab.getWebView() : null; if (view != null) - view.updateTopControls(false, true, false); + view.updateTopControls(false, true, animate); } - private void enableTopControls() { + protected void enableTopControls(boolean animate) { Tab tab = mBaseUi.getActiveTab(); WebView view = tab != null ? tab.getWebView() : null; if (view != null) - view.updateTopControls(true, true, true); + view.updateTopControls(true, true, animate); } @@ -296,9 +296,9 @@ public class TitleBar extends FrameLayout implements ViewTreeObserver.OnPreDrawL } //onPageFinished - showTopControls(); + showTopControls(false); if(!isFixed()) - enableTopControls(); + enableTopControls(true); } else { if (!mInLoad) { @@ -313,7 +313,7 @@ public class TitleBar extends FrameLayout implements ViewTreeObserver.OnPreDrawL if (!mShowing) { show(); } - showTopControls(); + showTopControls(false); } } |