diff options
Diffstat (limited to 'src/com/android/browser/TitleBar.java')
-rw-r--r-- | src/com/android/browser/TitleBar.java | 77 |
1 files changed, 1 insertions, 76 deletions
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index 1f9ec231..7438d26b 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -53,7 +53,6 @@ public class TitleBar extends RelativeLayout { private PageProgressView mProgress; private AccessibilityManager mAccessibilityManager; - private AutologinBar mAutoLogin; private NavigationBarBase mNavBar; private boolean mUseQuickControls; private SnapshotBar mSnapshotBar; @@ -84,16 +83,6 @@ public class TitleBar extends RelativeLayout { mNavBar.setTitleBar(this); } - private void inflateAutoLoginBar() { - if (mAutoLogin != null) { - return; - } - - ViewStub stub = (ViewStub) findViewById(R.id.autologin_stub); - mAutoLogin = (AutologinBar) stub.inflate(); - mAutoLogin.setTitleBar(this); - } - private void inflateSnapshotBar() { if (mSnapshotBar != null) { return; @@ -309,78 +298,14 @@ public class TitleBar extends RelativeLayout { int calculateEmbeddedHeight() { int height = mNavBar.getHeight(); - if (mAutoLogin != null && mAutoLogin.getVisibility() == View.VISIBLE) { - height += mAutoLogin.getHeight(); - } return height; } - public void updateAutoLogin(Tab tab, boolean animate) { - if (mAutoLogin == null) { - if (tab.getDeviceAccountLogin() == null) { - return; - } - inflateAutoLoginBar(); - } - mAutoLogin.updateAutoLogin(tab, animate); - } - - public void showAutoLogin(boolean animate) { - if (mUseQuickControls) { - mBaseUi.showTitleBar(); - } - if (mAutoLogin == null) { - inflateAutoLoginBar(); - } - mAutoLogin.setVisibility(View.VISIBLE); - if (animate) { - mAutoLogin.startAnimation(AnimationUtils.loadAnimation( - getContext(), R.anim.autologin_enter)); - } - } - - public void hideAutoLogin(boolean animate) { - if (mUseQuickControls) { - mBaseUi.hideTitleBar(); - mAutoLogin.setVisibility(View.GONE); - mBaseUi.refreshWebView(); - } else { - if (animate) { - Animation anim = AnimationUtils.loadAnimation(getContext(), - R.anim.autologin_exit); - anim.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationEnd(Animation a) { - mAutoLogin.setVisibility(View.GONE); - mBaseUi.refreshWebView(); - } - - @Override - public void onAnimationStart(Animation a) { - } - - @Override - public void onAnimationRepeat(Animation a) { - } - }); - mAutoLogin.startAnimation(anim); - } else if (mAutoLogin.getAnimation() == null) { - mAutoLogin.setVisibility(View.GONE); - mBaseUi.refreshWebView(); - } - } - } - public boolean wantsToBeVisible() { - return inAutoLogin() - || (mSnapshotBar != null && mSnapshotBar.getVisibility() == View.VISIBLE + return (mSnapshotBar != null && mSnapshotBar.getVisibility() == View.VISIBLE && mSnapshotBar.isAnimating()); } - private boolean inAutoLogin() { - return mAutoLogin != null && mAutoLogin.getVisibility() == View.VISIBLE; - } - public boolean isEditingUrl() { return mNavBar.isEditingUrl(); } |