summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2010-12-17 12:04:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-17 12:04:03 -0800
commit78db10ece1d81dfef021c8e32e3f3c8aae00fbbf (patch)
tree46f4bd89a52d31830de2757d2e168ac4ce5d2c25 /src
parente6e1c9169b485a8e06b0114d7ced7198f9a60a51 (diff)
parent281308fcc90dd37be3401a9abf033fb79c3d9351 (diff)
downloadpackages_apps_Browser-78db10ece1d81dfef021c8e32e3f3c8aae00fbbf.zip
packages_apps_Browser-78db10ece1d81dfef021c8e32e3f3c8aae00fbbf.tar.gz
packages_apps_Browser-78db10ece1d81dfef021c8e32e3f3c8aae00fbbf.tar.bz2
Merge "Fix 'Add Bookmarks' button on History view crash"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/CombinedBookmarkHistoryView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index cc56489..426b34d 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -197,6 +197,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout
fragment = mBookmarks;
mSeperateSelectAdd.setVisibility(View.VISIBLE);
mBookmarksHeader.setVisibility(View.VISIBLE);
+ mAddBookmark.setVisibility(View.VISIBLE);
mTabBookmarks.setActivated(true);
mTabHistory.setActivated(false);
break;
@@ -204,6 +205,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout
fragment = mHistory;
mBookmarksHeader.setVisibility(View.INVISIBLE);
mSeperateSelectAdd.setVisibility(View.INVISIBLE);
+ mAddBookmark.setVisibility(View.INVISIBLE);
mTabBookmarks.setActivated(false);
mTabHistory.setActivated(true);
break;