fix url bar
http://b/issue?id=3351733
added web /search icon
fixed positioning when focus changes
Change-Id: Ib917c2797c9886e6b899494798fb080757f01c7a
diff --git a/res/drawable-mdpi/textfield_active_holo_dark.9.png b/res/drawable-mdpi/textfield_active_holo_dark.9.png
index d37c8b2..7ca771f 100644
--- a/res/drawable-mdpi/textfield_active_holo_dark.9.png
+++ b/res/drawable-mdpi/textfield_active_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_default_holo_dark.9.png b/res/drawable-mdpi/textfield_default_holo_dark.9.png
index ab6abdc..621d024 100644
--- a/res/drawable-mdpi/textfield_default_holo_dark.9.png
+++ b/res/drawable-mdpi/textfield_default_holo_dark.9.png
Binary files differ
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 20081f0..f8eb03b 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -52,6 +52,12 @@
android:orientation="horizontal"
android:background="@drawable/url_background">
<ImageView
+ android:id="@+id/web_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_web_holo_dark"
+ style="@style/HoloIcon" />
+ <ImageView
android:id="@+id/voice_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 4822cc0..6caacdc 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -60,6 +60,7 @@
private ImageButton mBackButton;
private ImageButton mForwardButton;
private ImageView mStar;
+ private ImageView mWebIcon;
private View mSearchButton;
private View mUrlContainer;
private View mGoButton;
@@ -105,6 +106,7 @@
// back/forward. Probably should be done inside onPageStarted.
mBackButton = (ImageButton) findViewById(R.id.back);
mForwardButton = (ImageButton) findViewById(R.id.forward);
+ mWebIcon = (ImageView) findViewById(R.id.web_icon);
mStar = (ImageView) findViewById(R.id.star);
mStopButton = (ImageView) findViewById(R.id.stop);
mSearchButton = findViewById(R.id.search);
@@ -340,6 +342,7 @@
if (mInVoiceMode) {
mVoiceSearchIndicator.setVisibility(View.VISIBLE);
}
+ mWebIcon.setImageResource(R.drawable.ic_search_holo_dark);
updateSearchMode();
} else {
mUrlInput.clearFocus();
@@ -353,6 +356,7 @@
} else {
mSearchButton.setVisibility(View.VISIBLE);
}
+ mWebIcon.setImageResource(R.drawable.ic_web_holo_dark);
}
}
