summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/AddBookmarkPage.java38
-rw-r--r--src/com/android/browser/BaseUi.java8
-rw-r--r--src/com/android/browser/IntentHandler.java2
-rw-r--r--src/com/android/browser/SuggestionsAdapter.java4
-rw-r--r--src/com/android/browser/XLargeUi.java9
5 files changed, 49 insertions, 12 deletions
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index a93a518..ee080ca 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -105,7 +105,7 @@ public class AddBookmarkPage extends Activity
private View mFolderNamerHolder;
private View mAddNewFolder;
private View mAddSeparator;
- private long mCurrentFolder = 0;
+ private long mCurrentFolder;
private FolderAdapter mAdapter;
private BreadCrumbView mCrumbs;
private TextView mFakeTitle;
@@ -218,8 +218,26 @@ public class AddBookmarkPage extends Activity
if (mSaveToHomeScreen) {
mFolder.setSelectionIgnoringSelectionChange(0);
} else {
- // FIXME: Need to find the actual folder.
- mFolder.setSelectionIgnoringSelectionChange(mEditingFolder ? 0 : 1);
+ if (mCurrentFolder == mRootFolder) {
+ mFolder.setSelectionIgnoringSelectionChange(mEditingFolder ? 0 : 1);
+ } else {
+ Object data = mCrumbs.getTopData();
+ if (data != null && ((Folder) data).Id == mCurrentFolder) {
+ // We are showing the correct folder heirarchy. The
+ // folder selector will say "Other folder..." Change it
+ // to say the name of the folder once again.
+ ((TextView) mFolder.getSelectedView()).setText(((Folder) data).Name);
+ } else {
+ // We are not be showing the correct folder heirarchy.
+ // Clear the Crumbs and find the proper folder
+ mCrumbs.clear();
+ setupTopCrumb();
+ LoaderManager manager = getLoaderManager();
+ manager.restartLoader(LOADER_ID_ALL_FOLDERS, null, this);
+ manager.restartLoader(LOADER_ID_FOLDER_CONTENTS, null, this);
+
+ }
+ }
}
}
}
@@ -709,11 +727,7 @@ public class AddBookmarkPage extends Activity
if (mCurrentFolder == DEFAULT_FOLDER_ID) {
mCurrentFolder = mRootFolder;
}
- String name = getString(R.string.bookmarks);
- mTopLevelLabel = (TextView) mCrumbs.pushView(name, false,
- new Folder(name, mRootFolder));
- // To better match the other folders.
- mTopLevelLabel.setCompoundDrawablePadding(6);
+ setupTopCrumb();
if (mEditingExisting || TextUtils.isEmpty(mOriginalUrl)) {
onCurrentFolderFound();
} else {
@@ -724,6 +738,14 @@ public class AddBookmarkPage extends Activity
}
}
+ private void setupTopCrumb() {
+ String name = getString(R.string.bookmarks);
+ mTopLevelLabel = (TextView) mCrumbs.pushView(name, false,
+ new Folder(name, mRootFolder));
+ // To better match the other folders.
+ mTopLevelLabel.setCompoundDrawablePadding(6);
+ }
+
private void onCurrentFolderFound() {
LoaderManager manager = getLoaderManager();
if (mCurrentFolder != mRootFolder) {
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 5ccfdda..98fc349 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -430,7 +430,9 @@ public abstract class BaseUi implements UI, WebViewFactory {
CombinedBookmarkHistoryView.FRAGMENT_ID_HISTORY
: CombinedBookmarkHistoryView.FRAGMENT_ID_BOOKMARKS,
extras);
- getEmbeddedTitleBar().setVisibility(View.GONE);
+ FrameLayout wrapper =
+ (FrameLayout) mContentView.findViewById(R.id.webview_wrapper);
+ wrapper.setVisibility(View.GONE);
hideFakeTitleBar();
dismissIME();
if (mActiveTab != null) {
@@ -447,7 +449,9 @@ public abstract class BaseUi implements UI, WebViewFactory {
public void hideComboView() {
if (mComboView != null) {
mContentView.removeView(mComboView);
- getEmbeddedTitleBar().setVisibility(View.VISIBLE);
+ FrameLayout wrapper =
+ (FrameLayout) mContentView.findViewById(R.id.webview_wrapper);
+ wrapper.setVisibility(View.VISIBLE);
mComboView = null;
}
if (mActiveTab != null) {
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index e4b3201..2a34aba 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -178,6 +178,8 @@ public class IntentHandler {
current.getWebView().dumpRenderTree(true);
} else if ("about:debug.display".equals(urlData.mUrl)) {
current.getWebView().dumpDisplayTree();
+ } else if ("about:debug.nav".equals(urlData.mUrl)) {
+ current.getWebView().debugDump();
} else {
mSettings.toggleDebugSettings();
}
diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index abf9088..c2e203a 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -45,8 +45,8 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable,
OnClickListener {
static final int TYPE_BOOKMARK = 0;
- static final int TYPE_SUGGEST_URL = 1;
- static final int TYPE_HISTORY = 2;
+ static final int TYPE_HISTORY = 1;
+ static final int TYPE_SUGGEST_URL = 2;
static final int TYPE_SEARCH = 3;
static final int TYPE_SUGGEST = 4;
static final int TYPE_VOICE_SEARCH = 5;
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 9b344ec..d50d94e 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -20,6 +20,7 @@ import com.android.browser.ScrollWebView.ScrollListener;
import android.app.ActionBar;
import android.app.Activity;
+import android.os.Bundle;
import android.util.Log;
import android.view.ActionMode;
import android.view.Gravity;
@@ -71,6 +72,14 @@ public class XLargeUi extends BaseUi implements ScrollListener {
}
@Override
+ public void showComboView(boolean startWithHistory, Bundle extras) {
+ super.showComboView(startWithHistory, extras);
+ if (mUseQuickControls) {
+ mActionBar.show();
+ }
+ }
+
+ @Override
public void hideComboView() {
super.hideComboView();
// ComboView changes the action bar, set it back up to what we want
generated by cgit v1.1 at 2025-08-04 07:15:26 +0000