diff options
author | John Reck <jreck@google.com> | 2012-09-04 18:15:47 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 18:15:47 -0700 |
commit | 31b62c4c83cc6f2909731bd80cc75910cc7f3b8b (patch) | |
tree | 9a3afd46121b4373f21834c53fd77225a23a3d98 | |
parent | a05bb14549f6d7d3042739466a015c53ad910bd0 (diff) | |
parent | 1cc1d1d08c50211e4f9f8407978d0435a0110375 (diff) | |
download | packages_apps_Browser-31b62c4c83cc6f2909731bd80cc75910cc7f3b8b.zip packages_apps_Browser-31b62c4c83cc6f2909731bd80cc75910cc7f3b8b.tar.gz packages_apps_Browser-31b62c4c83cc6f2909731bd80cc75910cc7f3b8b.tar.bz2 |
Merge "Use a fixed title bar if accessibility is enabled" into jb-mr1-dev
-rw-r--r-- | src/com/android/browser/BaseUi.java | 1 | ||||
-rw-r--r-- | src/com/android/browser/TitleBar.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index c749465..b766fb9 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -171,6 +171,7 @@ public abstract class BaseUi implements UI { if (ct != null) { setActiveTab(ct); } + mTitleBar.onResume(); } protected boolean isActivityPaused() { diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index f5be5d3..874296a 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -26,6 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewStub; +import android.view.accessibility.AccessibilityManager; import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; import android.view.animation.AnimationUtils; @@ -47,6 +48,7 @@ public class TitleBar extends RelativeLayout { private BaseUi mBaseUi; private FrameLayout mContentView; private PageProgressView mProgress; + private AccessibilityManager mAccessibilityManager; private AutologinBar mAutoLogin; private NavigationBarBase mNavBar; @@ -66,6 +68,7 @@ public class TitleBar extends RelativeLayout { mUiController = controller; mBaseUi = ui; mContentView = contentView; + mAccessibilityManager = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE); initLayout(context); setFixedTitleBar(); } @@ -118,6 +121,7 @@ public class TitleBar extends RelativeLayout { private void setFixedTitleBar() { boolean isFixed = !mUseQuickControls && !mContext.getResources().getBoolean(R.bool.hide_title); + isFixed |= mAccessibilityManager.isEnabled(); // If getParent() returns null, we are initializing ViewGroup parent = (ViewGroup)getParent(); if (mIsFixedTitleBar == isFixed && parent != null) return; @@ -436,4 +440,8 @@ public class TitleBar extends RelativeLayout { } } + public void onResume() { + setFixedTitleBar(); + } + } |