summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/browser_add_bookmark.xml47
-rw-r--r--res/values/dimensions.xml4
-rw-r--r--res/values/integers.xml3
-rw-r--r--src/com/android/browser/AddBookmarkPage.java150
-rw-r--r--src/com/android/browser/BreadCrumbView.java11
5 files changed, 133 insertions, 82 deletions
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index 604bda8..e5f164f 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -15,11 +15,34 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="@dimen/add_bookmark_width"
android:layout_height="wrap_content"
android:orientation="vertical"
>
+ <com.android.browser.BreadCrumbView android:id="@+id/crumbs"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ />
+ <LinearLayout android:id="@+id/fake_title_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_list_bookmark"
+ />
+ <TextView android:id="@+id/fake_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/bookmark_this_page"
+ android:layout_gravity="center_horizontal"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ </LinearLayout>
+
<ImageView android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dip"
@@ -29,6 +52,7 @@
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"/>
+ <!-- XXX Use a TableLayout instead -->
<RelativeLayout android:id="@+id/default_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -53,7 +77,7 @@
<EditText
android:id="@+id/title"
android:layout_height="wrap_content"
- android:layout_width="250dip"
+ android:layout_width="325dip"
android:gravity="fill_horizontal"
android:layout_alignBaseline="@+id/titleText"
android:layout_toRightOf="@+id/titleText"
@@ -79,7 +103,7 @@
<EditText
android:id="@+id/address"
android:layout_height="wrap_content"
- android:layout_width="250dip"
+ android:layout_width="325dip"
android:hint="@string/http"
android:layout_alignBaseline="@+id/addressText"
android:layout_alignLeft="@+id/title"
@@ -113,25 +137,12 @@
</RelativeLayout>
<LinearLayout android:id="@+id/folder_selector"
- android:layout_width="500dip"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/folder_selector_height"
android:orientation="vertical"
android:visibility="gone"
>
- <TextView
- android:id="@+id/path"
- android:layout_marginTop="4dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_marginBottom="4dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="start"
- android:text="@string/bookmarks"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
<ListView
android:id="@+id/list"
android:layout_marginLeft="16dip"
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 4d19a9f..f550cf7 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -21,4 +21,6 @@
<dimen name="bookmarkThumbnailWidth">90dip</dimen>
<dimen name="bookmarkThumbnailHeight">80dip</dimen>
-</resources> \ No newline at end of file
+ <dimen name="add_bookmark_width">500dip</dimen>
+ <dimen name="folder_selector_height">300dip</dimen>
+</resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 7508e00..c923805 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -20,4 +20,5 @@
<integer name="max_tabs">16</integer>
<!-- The duration of the tab animations in millisecs -->
<integer name="tab_animation_duration">500</integer>
-</resources> \ No newline at end of file
+ <integer name="max_width_crumb">200</integer>
+</resources>
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index c1bafd6..1f14629 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -58,14 +58,20 @@ import android.widget.Toast;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Stack;
public class AddBookmarkPage extends Activity
implements View.OnClickListener, TextView.OnEditorActionListener,
- AdapterView.OnItemClickListener, LoaderManager.LoaderCallbacks<Cursor> {
+ AdapterView.OnItemClickListener, LoaderManager.LoaderCallbacks<Cursor>,
+ BreadCrumbView.Controller {
public static final long DEFAULT_FOLDER_ID = -1;
+ private static final int MAX_CRUMBS_SHOWN = 2;
+
private final String LOGTAG = "Bookmarks";
+ // Set to true to see the crash on the code I would like to run.
+ private final boolean DEBUG_CRASH = false;
// IDs for the CursorLoaders that are used.
private final int LOADER_ID_FOLDER_CONTENTS = 0;
@@ -87,8 +93,8 @@ public class AddBookmarkPage extends Activity
private View mAddNewFolder;
private long mCurrentFolder = 0;
private FolderAdapter mAdapter;
- private ArrayList<Folder> mPaths;
- private TextView mPath;
+ private BreadCrumbView mCrumbs;
+ private View mFakeTitleBar;
private static class Folder {
String Name;
@@ -109,6 +115,51 @@ public class AddBookmarkPage extends Activity
}
@Override
+ public void onTop(int level, Object data) {
+ if (null == data) return;
+ mCurrentFolder = (Long) data;
+ Uri uri = BrowserContract.Bookmarks.buildFolderUri(mCurrentFolder);
+ LoaderManager manager = getLoaderManager();
+ CursorLoader loader = (CursorLoader) ((Loader) manager.getLoader(
+ LOADER_ID_FOLDER_CONTENTS));
+ loader.setUri(uri);
+ loader.forceLoad();
+ updateVisible();
+ }
+
+ /**
+ * Update the views shown to only show the two deepest levels of crumbs.
+ * Note that this method depends on internal knowledge of BreadCrumbView.
+ */
+ private void updateVisible() {
+ if (MAX_CRUMBS_SHOWN > 0) {
+ int invisibleCrumbs = mCrumbs.size() - MAX_CRUMBS_SHOWN;
+ // This class always uses a back button, which is the first child.
+ int childIndex = 1;
+ if (invisibleCrumbs > 0) {
+ int crumbIndex = 0;
+ while (crumbIndex < invisibleCrumbs) {
+ // Set the crumb to GONE.
+ mCrumbs.getChildAt(childIndex).setVisibility(View.GONE);
+ childIndex++;
+ // Each crumb is followed by a separator (except the last
+ // one). Also make it GONE
+ mCrumbs.getChildAt(childIndex).setVisibility(View.GONE);
+ childIndex++;
+ // Move to the next crumb.
+ crumbIndex++;
+ }
+ }
+ // Make sure the last two are visible.
+ int childCount = mCrumbs.getChildCount();
+ while (childIndex < childCount) {
+ mCrumbs.getChildAt(childIndex).setVisibility(View.VISIBLE);
+ childIndex++;
+ }
+ }
+ }
+
+ @Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (v == mFolderNamer) {
if (v.getText().length() > 0) {
@@ -136,7 +187,8 @@ public class AddBookmarkPage extends Activity
// User has selected a folder. Go back to the opening page
mFolderSelector.setVisibility(View.GONE);
mDefaultView.setVisibility(View.VISIBLE);
- setTitle(R.string.bookmark_this_page);
+ mCrumbs.setVisibility(View.GONE);
+ mFakeTitleBar.setVisibility(View.VISIBLE);
}
} else if (save()) {
finish();
@@ -192,15 +244,15 @@ public class AddBookmarkPage extends Activity
private void switchToFolderSelector() {
mDefaultView.setVisibility(View.GONE);
mFolderSelector.setVisibility(View.VISIBLE);
- setTitle(R.string.containing_folder);
+ mCrumbs.setVisibility(View.VISIBLE);
+ mFakeTitleBar.setVisibility(View.GONE);
}
private void descendInto(String foldername, long id) {
if (id != DEFAULT_FOLDER_ID) {
mCurrentFolder = id;
- mPaths.add(new Folder(foldername, id));
- updatePathString();
- getLoaderManager().restartLoader(LOADER_ID_FOLDER_CONTENTS, null, this);
+ mCrumbs.pushView(foldername, id);
+ mCrumbs.notifyController();
}
}
@@ -253,6 +305,7 @@ public class AddBookmarkPage extends Activity
BrowserContract.Bookmarks.TITLE);
int parentIndex = cursor.getColumnIndexOrThrow(
BrowserContract.Bookmarks.PARENT);
+ Stack folderStack = new Stack();
while ((parent != BrowserProvider2.FIXED_ID_ROOT) &&
(parent != 0)) {
// First, find the folder corresponding to the current
@@ -269,31 +322,21 @@ public class AddBookmarkPage extends Activity
+ ") holding this bookmark does not exist!");
}
String name = cursor.getString(titleIndex);
- mPaths.add(1, new Folder(name, parent));
+ folderStack.push(new Folder(name, parent));
parent = cursor.getLong(parentIndex);
}
+ while (!folderStack.isEmpty()) {
+ Folder thisFolder = (Folder) folderStack.pop();
+ mCrumbs.pushView(thisFolder.Name, thisFolder.Id);
+ }
getLoaderManager().stopLoader(LOADER_ID_ALL_FOLDERS);
- updatePathString();
+ updateVisible();
break;
default:
break;
}
}
- /**
- * Update the TextViews in both modes to display the full path of the
- * current location to insert.
- */
- private void updatePathString() {
- String path = mPaths.get(0).Name;
- int size = mPaths.size();
- for (int i = 1; i < size; i++) {
- path += " / " + mPaths.get(i).Name;
- }
- mPath.setText(path);
- mFolder.setText(path);
- }
-
@Override
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
@@ -329,15 +372,21 @@ public class AddBookmarkPage extends Activity
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
- requestWindowFeature(Window.FEATURE_LEFT_ICON);
+ if (DEBUG_CRASH) {
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ } else {
+ requestWindowFeature(Window.FEATURE_LEFT_ICON);
+ }
mMap = getIntent().getExtras();
setContentView(R.layout.browser_add_bookmark);
- setTitle(R.string.bookmark_this_page);
Window window = getWindow();
- window.setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_list_bookmark);
+ if (!DEBUG_CRASH) {
+ setTitle(R.string.bookmark_this_page);
+ window.setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_list_bookmark);
+ }
String title = null;
String url = null;
@@ -347,7 +396,11 @@ public class AddBookmarkPage extends Activity
if (b != null) {
mMap = b;
mEditingExisting = true;
- setTitle(R.string.edit_bookmark);
+ TextView fakeTitle = (TextView) findViewById(R.id.fake_title);
+ fakeTitle.setText(R.string.edit_bookmark);
+ if (!DEBUG_CRASH) {
+ setTitle(R.string.bookmark_this_page);
+ }
} else {
int gravity = mMap.getInt("gravity", -1);
if (gravity != -1) {
@@ -390,12 +443,16 @@ public class AddBookmarkPage extends Activity
mAddNewFolder = findViewById(R.id.add_new_folder);
mAddNewFolder.setOnClickListener(this);
- mPath = (TextView) findViewById(R.id.path);
- ListView list = (ListView) findViewById(R.id.list);
+ mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs);
+ mCrumbs.setUseBackButton(true);
+ mCrumbs.setController(this);
+ mCrumbs.pushView(getString(R.string.bookmarks), false,
+ BrowserProvider2.FIXED_ID_ROOT);
+
+ mFakeTitleBar = findViewById(R.id.fake_title_bar);
- mPaths = new ArrayList<Folder>();
- mPaths.add(0, new Folder(getString(R.string.bookmarks), BrowserProvider2.FIXED_ID_ROOT));
mAdapter = new FolderAdapter(this);
+ ListView list = (ListView) findViewById(R.id.list);
list.setAdapter(mAdapter);
list.setOnItemClickListener(this);
LoaderManager manager = getLoaderManager();
@@ -445,35 +502,6 @@ public class AddBookmarkPage extends Activity
return BrowserProvider2.FIXED_ID_ROOT;
}
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
- if (mFolderSelector.getVisibility() == View.VISIBLE
- && KeyEvent.KEYCODE_BACK == event.getKeyCode()) {
- if (KeyEvent.ACTION_UP == event.getAction()) {
- if (mFolderNamer.getVisibility() == View.VISIBLE) {
- mFolderNamer.setVisibility(View.GONE);
- mAddNewFolder.setVisibility(View.VISIBLE);
- getInputMethodManager().hideSoftInputFromWindow(
- mFolderNamer.getWindowToken(), 0);
- } else {
- int size = mPaths.size();
- if (1 == size) {
- // We have reached the top level
- finish();
- } else {
- // Go up a level
- mPaths.remove(size - 1);
- mCurrentFolder = mPaths.get(size - 2).Id;
- updatePathString();
- getLoaderManager().restartLoader(LOADER_ID_FOLDER_CONTENTS, null, this);
- }
- }
- }
- return true;
- }
- return super.dispatchKeyEvent(event);
- }
-
/**
* Runnable to save a bookmark, so it can be performed in its own thread.
*/
diff --git a/src/com/android/browser/BreadCrumbView.java b/src/com/android/browser/BreadCrumbView.java
index d2a50c9..8e3acf7 100644
--- a/src/com/android/browser/BreadCrumbView.java
+++ b/src/com/android/browser/BreadCrumbView.java
@@ -17,6 +17,7 @@
package com.android.browser;
import android.content.Context;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
@@ -121,7 +122,11 @@ public class BreadCrumbView extends LinearLayout implements OnClickListener {
}
public void pushView(String name, Object data) {
- Crumb crumb = new Crumb(name, true, data);
+ pushView(name, true, data);
+ }
+
+ public void pushView(String name, boolean canGoBack, Object data) {
+ Crumb crumb = new Crumb(name, canGoBack, data);
pushCrumb(crumb);
}
@@ -245,6 +250,10 @@ public class BreadCrumbView extends LinearLayout implements OnClickListener {
tv.setText(name);
tv.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT));
+ tv.setMaxWidth(mContext.getResources().getInteger(
+ R.integer.max_width_crumb));
+ tv.setMaxLines(1);
+ tv.setEllipsize(TextUtils.TruncateAt.END);
return tv;
}
generated by cgit v1.1 at 2024-12-26 16:15:01 +0000