Merge "Import revised translations. DO NOT MERGE" into ics-mr1
diff --git a/res/layout-port/autofill_settings_fragment.xml b/res/layout-port/autofill_settings_fragment.xml
index 63dba4d..097074b 100644
--- a/res/layout-port/autofill_settings_fragment.xml
+++ b/res/layout-port/autofill_settings_fragment.xml
@@ -56,7 +56,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textPersonName|textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -71,7 +72,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -97,7 +99,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -123,7 +126,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -138,7 +142,8 @@
android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -153,7 +158,8 @@
android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -168,7 +174,8 @@
android:layout_margin="2dip"
android:inputType="textCapCharacters"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -183,7 +190,8 @@
android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -198,7 +206,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
- android:phoneNumber="true" />
+ android:phoneNumber="true"
+ android:imeOptions="actionNext" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -213,7 +222,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textEmailAddress"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionDone" />
</LinearLayout>
</ScrollView>
diff --git a/res/layout/autofill_settings_fragment.xml b/res/layout/autofill_settings_fragment.xml
index 8c90dd7..44bf8f0 100644
--- a/res/layout/autofill_settings_fragment.xml
+++ b/res/layout/autofill_settings_fragment.xml
@@ -62,7 +62,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textPersonName|textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -79,7 +80,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -107,7 +109,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -135,7 +138,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -152,7 +156,8 @@
android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -169,7 +174,8 @@
android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -186,7 +192,8 @@
android:layout_margin="2dip"
android:inputType="textCapCharacters"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -203,7 +210,8 @@
android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -220,7 +228,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
- android:phoneNumber="true" />
+ android:phoneNumber="true"
+ android:imeOptions="actionNext" />
</TableRow>
<TableRow>
<TextView
@@ -237,7 +246,8 @@
android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textEmailAddress"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:imeOptions="actionDone" />
</TableRow>
</TableLayout>
</LinearLayout>
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index bf95574..bd40c51 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -39,6 +39,11 @@
android:title="@string/new_incognito_tab"
android:icon="@drawable/ic_new_incognito_holo_dark" />
<item
+ android:id="@+id/bookmarks_menu_id"
+ android:title="@string/bookmarks"
+ android:icon="@drawable/ic_bookmarks_holo_dark"
+ android:showAsAction="never" />
+ <item
android:id="@+id/add_bookmark_menu_id"
android:title="@string/save_to_bookmarks"
android:icon="@drawable/ic_bookmark_on_holo_dark"
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 37d0b34..4da0668 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -194,6 +194,10 @@
@Override
public void updateMenuState(Tab tab, Menu menu) {
+ MenuItem bm = menu.findItem(R.id.bookmarks_menu_id);
+ if (bm != null) {
+ bm.setVisible(!showingNavScreen());
+ }
MenuItem abm = menu.findItem(R.id.add_bookmark_menu_id);
if (abm != null) {
abm.setVisible((tab != null) && !tab.isSnapshot() && !showingNavScreen());
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 556e88d..c828df4 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -30,6 +30,8 @@
import android.view.ActionMode;
import android.view.Gravity;
import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebChromeClient.CustomViewCallback;
@@ -145,6 +147,16 @@
}
}
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ MenuItem bm = menu.findItem(R.id.bookmarks_menu_id);
+ if (bm != null) {
+ bm.setVisible(false);
+ }
+ return true;
+ }
+
+
// WebView callbacks
@Override