summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-07-06 10:01:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-06 10:01:28 -0700
commitff77a4b7d264ddfd2a153e4f1adfce84e4d5bc76 (patch)
tree1c33ba9cb5cfe22fa00962b311713e1e54e2abe1 /src/com/android
parenta55da99bb24b952e8ba5cc08d5ad4da7e1344355 (diff)
parent6ac5bfda1a372219e469d965e94899d3b4895e0f (diff)
downloadpackages_apps_browser-ff77a4b7d264ddfd2a153e4f1adfce84e4d5bc76.zip
packages_apps_browser-ff77a4b7d264ddfd2a153e4f1adfce84e4d5bc76.tar.gz
packages_apps_browser-ff77a4b7d264ddfd2a153e4f1adfce84e4d5bc76.tar.bz2
Merge "Temporarily show title bar on setActiveTab"
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/BaseUi.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index e2ad329..0777efd 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -250,6 +250,10 @@ public abstract class BaseUi implements UI, OnTouchListener {
boolean incognito = mActiveTab.getWebView().isPrivateBrowsingEnabled();
getTitleBar().setIncognitoMode(incognito);
updateAutoLogin(tab, false);
+ if (web != null && web.getVisibleTitleHeight()
+ != getTitleBar().getEmbeddedHeight()) {
+ showTitleBarForDuration();
+ }
}
Tab getActiveTab() {
@@ -819,6 +823,13 @@ public abstract class BaseUi implements UI, OnTouchListener {
}
}
+ private void showTitleBarForDuration() {
+ mHandler.removeMessages(MSG_HIDE_TITLEBAR);
+ showTitleBar();
+ Message msg = Message.obtain(mHandler, MSG_HIDE_TITLEBAR);
+ mHandler.sendMessageDelayed(msg, HIDE_TITLEBAR_DELAY);
+ }
+
@Override
public boolean onTouch(View v, MotionEvent event) {
switch (event.getAction()) {