Url bar selection handling updated
Bug: 3222647
framework has been updated to change the way tap/double tap
and long press are handled
url bar uses a custom action bar to add the share option
Change-Id: Ie75fc07fe71c9e16fc7f83deda8ecddea39b0397
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 2a67c72..ba93d1b 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -63,7 +63,7 @@
android:layout_height="match_parent"
style="@style/HoloIcon"
android:visibility="gone" />
- <EditText
+ <TextView
android:id="@+id/url_unfocused"
android:layout_width="0dip"
android:layout_weight="1.0"
@@ -76,9 +76,7 @@
android:singleLine="true"
android:ellipsize="end"
android:lines="1"
- android:scrollHorizontally="true"
- android:inputType="textUri"
- android:imeOptions="actionGo" />
+ android:scrollHorizontally="true" />
<ImageButton
android:id="@+id/star"
android:src="@drawable/ic_favorite_off_normal"
diff --git a/res/menu/url_selection.xml b/res/menu/url_selection.xml
new file mode 100644
index 0000000..1bb6d0e
--- /dev/null
+++ b/res/menu/url_selection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/share"
+ android:icon="@drawable/ic_menu_share_normal"
+ android:title="@string/menu_share_url"
+ android:showAsAction="always|withText"
+ />
+</menu>
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e98d9d5..ece6ffa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -871,4 +871,10 @@
<!-- Button allowing users to import all of their existing bookmarks into an account when setting up syncing with their bookmarks stored in Google Chrome [CHAR-LIMIT=64] -->
<string name="import_bookmarks_dialog_import">Add your Android bookmarks to bookmarks for <xliff:g id="Google account" example="account@example.com">%s</xliff:g></string>
+
+ <!-- Url Selection Action Mode -->
+
+ <!-- Menu item to share URL selection [CHAR LIMIT=30] -->
+ <string name="menu_share_url">Share</string>
+
</resources>