merge in ics-mr1-release history after reset to 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/values-tr/strings.xml b/res/values-tr/strings.xml
index 81136f1..7ed35f3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -379,7 +379,7 @@
<string name="accessibility_button_newtab" msgid="4116986240706315748">"Yeni sekme aç"</string>
<string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"Yeni gizli sekme aç"</string>
<string name="accessibility_button_clear" msgid="6943152307986161598">"Girdiyi temizle"</string>
- <string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Kullanıcı aracısını değiştir"</string>
+ <string name="accessibility_button_uaswitch" msgid="6286804719724282339">"User agent\'ı değiştir"</string>
<string name="accessibility_button_go" msgid="1182818872083055958">"Git"</string>
<string name="accessibility_button_navscreen" msgid="9142904748728713075">"Sayfa yöneticisi"</string>
<string name="accessibility_button_more" msgid="3054251446394224216">"Diğer seçenekler"</string>
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index ca91367..69063eb 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -749,8 +749,7 @@
public void setFullscreen(boolean enabled) {
Window win = mActivity.getWindow();
WindowManager.LayoutParams winParams = win.getAttributes();
- final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN
- | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+ final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
if (enabled) {
winParams.flags |= bits;
} else {