Quick Control adjustments
changed new tab behavior
always show url bar when new tab is created
tapping tab shows url bar
fixed http://b/issue?id=3322095
changed pie background; frameworks has paint alpha bug
changed preferences title to "Labs"
Change-Id: I3033abd98d87a1f4595667f2cd8d1d0a674f5eda
diff --git a/res/drawable-mdpi/ic_pie_web.png b/res/drawable-mdpi/ic_pie_web.png
new file mode 100644
index 0000000..86e41ff
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_web.png
Binary files differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cb1b754..834bead 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,7 +29,7 @@
<color name="bookmarkWidgetDivider">#383847</color>
<color name="bookmarkWidgetItemBackground">#2b2b3c</color>
<color name="bookmarkWidgetFolderBackground">#A0383847</color>
- <color name="qc_slice_normal">#C0A0A0A0</color>
- <color name="qc_slice_active">#C02090FF</color>
+ <color name="qc_slice_normal">#E0A0A0A0</color>
+ <color name="qc_slice_active">#E02090FF</color>
<color name="bookmarkWidgetFaviconBackground">#23ffffff</color>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b8a45bf..9eefc20 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -603,7 +603,7 @@
</string-array>
<string name="pref_default_text_encoding_default" translatable="false">Latin-1</string>
<!-- Title for lab settings [CHAR LIMIT=25] -->
- <string name="pref_lab_title">Lab</string>
+ <string name="pref_lab_title">Labs</string>
<!-- Title for lab quick controls feature [CHAR LIMIT=40] -->
<string name="pref_lab_quick_controls">Quick Controls</string>
<!-- Summary for lab quick controls feature [CHAR LIMIT=80] -->
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 210e9ea..6326f2e 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -70,7 +70,7 @@
mPie.addItem(mRefresh);
mBack = makeMenuView(R.drawable.ic_pie_back);
mPie.addItem(mBack);
- mUrl = makeMenuView(R.drawable.ic_pie_search);
+ mUrl = makeMenuView(R.drawable.ic_pie_web);
mPie.addItem(mUrl);
mBookmarks = makeMenuView(R.drawable.ic_pie_bookmarks);
mPie.addItem(mBookmarks);
@@ -133,6 +133,7 @@
mUiController.bookmarksOrHistoryPicker(false);
} else if (mNewTab == v) {
mUiController.openTabToHomePage();
+ mUi.showFakeTitleBarAndEdit();
} else if (mClose == v) {
mUiController.closeCurrentTab();
} else {
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 502512a..ba123d0 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -16,7 +16,6 @@
package com.android.browser;
-import android.graphics.Matrix;
import com.android.browser.ScrollWebView.ScrollListener;
import android.app.Activity;
@@ -26,6 +25,7 @@
import android.graphics.BitmapShader;
import android.graphics.Canvas;
import android.graphics.Color;
+import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.Shader;
@@ -33,6 +33,7 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.PaintDrawable;
+import android.util.Log;
import android.view.ContextMenu;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -140,6 +141,8 @@
void setUseQuickControls(boolean useQuickControls) {
mUseQuickControls = useQuickControls;
+ mNewTab.setVisibility(mUseQuickControls ? View.GONE
+ : View.VISIBLE);
}
int getTabCount() {
@@ -160,7 +163,9 @@
super.onMeasure(hspec, vspec);
int w = getMeasuredWidth();
// adjust for new tab overlap
- w -= mTabOverlap;
+ if (!mUseQuickControls) {
+ w -= mTabOverlap;
+ }
setMeasuredDimension(w, getMeasuredHeight());
}
@@ -188,8 +193,14 @@
if (mNewTab == view) {
mUiController.openTabToHomePage();
} else if (mTabs.getSelectedTab() == view) {
- if (mUseQuickControls) return;
- if (mUi.isFakeTitleBarShowing() && !isLoading()) {
+ if (mUseQuickControls) {
+ if (mUi.isFakeTitleBarShowing() && !isLoading()) {
+ mUi.hideFakeTitleBar();
+ } else {
+ mUi.stopWebViewScrolling();
+ mUi.showFakeTitleBarAndEdit();
+ }
+ } else if (mUi.isFakeTitleBarShowing() && !isLoading()) {
mUi.hideFakeTitleBar();
} else {
showUrlBar();
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index ac121cc..1e607a7 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -276,6 +276,7 @@
@Override
protected void hideFakeTitleBar() {
if (isFakeTitleBarShowing()) {
+ mFakeTitleBar.setUrlMode(false);
mContentView.removeView(mFakeTitleBar);
mTabBar.onHideTitleBar();
}
