summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-22 16:13:43 -0800
committerMichael Kolb <kolby@google.com>2011-11-22 16:34:07 -0800
commit59b4ff383c69b9c301df81d97e36951e3e5aa863 (patch)
tree89618d9e5f05873abf30d8cb3bf719d0ba475872 /src/com
parenta48621be8a537284f37b843388b30017b0cfce51 (diff)
downloadpackages_apps_browser-59b4ff383c69b9c301df81d97e36951e3e5aa863.zip
packages_apps_browser-59b4ff383c69b9c301df81d97e36951e3e5aa863.tar.gz
packages_apps_browser-59b4ff383c69b9c301df81d97e36951e3e5aa863.tar.bz2
Add more options to Quick Controls on phone
Bug: 5660535 added new tab and bookmarks increased radius of controls Change-Id: I7034e072eae8d59b06c71347b91d9fa042fde3b6
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/browser/PieControlPhone.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/browser/PieControlPhone.java b/src/com/android/browser/PieControlPhone.java
index f12c49a..2b6a3c5 100644
--- a/src/com/android/browser/PieControlPhone.java
+++ b/src/com/android/browser/PieControlPhone.java
@@ -24,6 +24,7 @@ import android.view.View.OnClickListener;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
+import com.android.browser.UI.ComboViews;
import com.android.browser.view.PieItem;
import com.android.browser.view.PieMenu.PieView.OnLayoutListener;
import com.android.browser.view.PieStackView;
@@ -40,6 +41,8 @@ public class PieControlPhone extends PieControlBase implements OnClickListener,
private PieItem mUrl;
private PieItem mShowTabs;
private PieItem mOptions;
+ private PieItem mNewTab;
+ private PieItem mBookmarks;
private TabAdapter mTabAdapter;
private PopupMenu mPopup;
@@ -67,10 +70,14 @@ public class PieControlPhone extends PieControlBase implements OnClickListener,
1);
// level 1
+ mNewTab = makeItem(R.drawable.ic_new_window_holo_dark, 1);
+ mBookmarks = makeItem(R.drawable.ic_bookmarks_holo_dark, 1);
+ mPie.addItem(mNewTab);
mPie.addItem(mShowTabs);
mPie.addItem(mUrl);
+ mPie.addItem(mBookmarks);
mPie.addItem(mOptions);
- setClickListener(this, mUrl, mShowTabs, mOptions);
+ setClickListener(this, mUrl, mShowTabs, mOptions, mNewTab, mBookmarks);
mPopup = new PopupMenu(mActivity, mUi.getTitleBar());
Menu menu = mPopup.getMenu();
mPopup.getMenuInflater().inflate(R.menu.browser, menu);
@@ -105,6 +112,11 @@ public class PieControlPhone extends PieControlBase implements OnClickListener,
mUi.showNavScreen();
} else if (mOptions.getView() == v) {
showMenu();
+ } else if (mNewTab.getView() == v) {
+ mUiController.openTabToHomePage();
+ mUi.editUrl(false);
+ } else if (mBookmarks.getView() == v) {
+ mUiController.bookmarksOrHistoryPicker(ComboViews.Bookmarks);
}
}