diff options
author | Michael Kolb <kolby@google.com> | 2011-03-29 15:37:03 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2011-03-30 16:40:49 -0700 |
commit | c16c595136aa7b49927a43ead26241abb1c731ca (patch) | |
tree | 051cb02a46bf53e69d0ddf9ca9e67b817aa24d8f /src | |
parent | 135e3515fd06c8b32691ed73c63602424343ad1b (diff) | |
download | android_packages_apps_Gello-c16c595136aa7b49927a43ead26241abb1c731ca.tar.gz android_packages_apps_Gello-c16c595136aa7b49927a43ead26241abb1c731ca.tar.bz2 android_packages_apps_Gello-c16c595136aa7b49927a43ead26241abb1c731ca.zip |
add old progress bar to ui
Change-Id: I53023ee54edf17894c51cb3247d7f2f2e2c7c240
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/browser/BaseUi.java | 3 | ||||
-rw-r--r-- | src/com/android/browser/PhoneUi.java | 28 | ||||
-rw-r--r-- | src/com/android/browser/PieControl.java | 2 | ||||
-rw-r--r-- | src/com/android/browser/TitleBarPhone.java | 24 | ||||
-rw-r--r-- | src/com/android/browser/TitleBarXLarge.java | 1 | ||||
-rw-r--r-- | src/com/android/browser/XLargeUi.java | 4 |
6 files changed, 48 insertions, 14 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index c00e6fc9..2a03893a 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -481,8 +481,9 @@ public abstract class BaseUi implements UI, WebViewFactory { FrameLayout wrapper = (FrameLayout) mContentView.findViewById(R.id.webview_wrapper); wrapper.setVisibility(View.GONE); - hideTitleBar(); + getTitleBar().stopEditingUrl(); dismissIME(); + hideTitleBar(); if (mActiveTab != null) { WebView web = mActiveTab.getWebView(); mActiveTab.putInBackground(); diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index 9cc5a2fc..42e2aff4 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -104,16 +104,22 @@ public class PhoneUi extends BaseUi { @Override public void onProgressChanged(Tab tab) { - if (mUseQuickControls) return; if (tab.inForeground()) { int progress = tab.getLoadProgress(); mTitleBar.setProgress(progress); if (progress == 100) { if (!mOptionsMenuOpen || !mExtendedMenuOpen) { hideTitleBar(); + if (mUseQuickControls) { + mTitleBar.setShowProgressOnly(false); + } } } else { if (!mOptionsMenuOpen || mExtendedMenuOpen) { + if (mUseQuickControls && !mTitleBar.isEditingUrl()) { + mTitleBar.setShowProgressOnly(true); + setTitleGravity(Gravity.TOP); + } showTitleBar(); } } @@ -272,13 +278,13 @@ public class PhoneUi extends BaseUi { @Override public void onActionModeFinished(boolean inLoad) { - // TODO: Remove once b/4136071 is fixed - new Handler().post(new Runnable() { - @Override - public void run() { - mActivity.getActionBar().hide(); + if (inLoad) { + if (mUseQuickControls) { + mTitleBar.setShowProgressOnly(true); } - }); + showTitleBar(); + } + mActivity.getActionBar().hide(); } @Override @@ -331,7 +337,6 @@ public class PhoneUi extends BaseUi { mUseQuickControls = useQuickControls; getTitleBar().setUseQuickControls(mUseQuickControls); if (useQuickControls) { -// checkTabCount(); mPieControl = new PieControl(mActivity, mUiController, this); mPieControl.attachToContainer(mContentView); Tab tab = getActiveTab(); @@ -373,4 +378,11 @@ public class PhoneUi extends BaseUi { .getDimension(R.dimen.tab_view_thumbnail_height)); } } + + @Override + void showTitleBarAndEdit() { + mTitleBar.setShowProgressOnly(false); + super.showTitleBarAndEdit(); + } + } diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java index 82e26c49..846811dc 100644 --- a/src/com/android/browser/PieControl.java +++ b/src/com/android/browser/PieControl.java @@ -128,10 +128,10 @@ public class PieControl implements OnClickListener, PieMenu.PieController { // level 2 mPie.addItem(mForward); mPie.addItem(mRefresh); + mPie.addItem(mOptions); mPie.addItem(mShowTabs); mPie.addItem(mNewTab); mPie.addItem(mClose); - mPie.addItem(mOptions); mPie.setController(this); } container.addView(mPie); diff --git a/src/com/android/browser/TitleBarPhone.java b/src/com/android/browser/TitleBarPhone.java index d6b5f4df..3edd831f 100644 --- a/src/com/android/browser/TitleBarPhone.java +++ b/src/com/android/browser/TitleBarPhone.java @@ -42,7 +42,8 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener OnClickListener, TextChangeWatcher { private Activity mActivity; - private StopProgressView mStopButton; + private ImageView mStopButton; + private PageProgressView mProgress; private ImageView mVoiceButton; private boolean mInLoad; private View mContainer; @@ -60,8 +61,9 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener mContainer = findViewById(R.id.taburlbar); mLockIcon = (ImageView) findViewById(R.id.lock); mFavicon = (ImageView) findViewById(R.id.favicon); - mStopButton = (StopProgressView) findViewById(R.id.stop); + mStopButton = (ImageView) findViewById(R.id.stop); mStopButton.setOnClickListener(this); + mProgress = (PageProgressView) findViewById(R.id.progress); mVoiceButton = (ImageView) findViewById(R.id.voice); mVoiceButton.setOnClickListener(this); setFocusState(false); @@ -119,14 +121,24 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener */ @Override void setProgress(int newProgress) { + boolean blockvisuals = mUseQuickControls && isEditingUrl(); if (newProgress >= PROGRESS_MAX) { mInLoad = false; + if (!blockvisuals) { + mProgress.setProgress(PageProgressView.MAX_PROGRESS); + mProgress.setVisibility(View.GONE); + } setFocusState(mUrlInput.hasFocus()); } else { if (!mInLoad) { mInLoad = true; + if (!blockvisuals) { + mProgress.setVisibility(View.VISIBLE); + } setFocusState(mUrlInput.hasFocus()); } + mProgress.setProgress(newProgress * PageProgressView.MAX_PROGRESS + / PROGRESS_MAX); } } @@ -200,6 +212,14 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener setLayoutParams(makeLayoutParams()); } + void setShowProgressOnly(boolean progress) { + if (progress && !inAutoLogin()) { + mContainer.setVisibility(View.GONE); + } else { + mContainer.setVisibility(View.VISIBLE); + } + } + private ViewGroup.LayoutParams makeLayoutParams() { if (mUseQuickControls) { return new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java index 7a8d984c..42540468 100644 --- a/src/com/android/browser/TitleBarXLarge.java +++ b/src/com/android/browser/TitleBarXLarge.java @@ -211,6 +211,7 @@ public class TitleBarXLarge extends TitleBarBase * called from the Ui when the user wants to edit * @param clearInput clear the input field */ + @Override void startEditingUrl(boolean clearInput) { // editing takes preference of progress mContainer.setVisibility(View.VISIBLE); diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java index 7e78f0dc..e19515e6 100644 --- a/src/com/android/browser/XLargeUi.java +++ b/src/com/android/browser/XLargeUi.java @@ -291,10 +291,10 @@ public class XLargeUi extends BaseUi implements ScrollListener { mTitleBar.startEditingUrl(clearInput); } + @Override void showTitleBarAndEdit() { mTitleBar.setShowProgressOnly(false); - showTitleBar(); - mTitleBar.startEditingUrl(false); + super.showTitleBarAndEdit(); } void stopEditingUrl() { |