Merge "updates and improvements on PopularUrlsTest"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 798fc3a..50a7be0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -121,11 +121,15 @@
android:resource="@xml/searchable" />
</activity>
- <activity android:name="CombinedBookmarkHistoryActivity" android:label=""
+ <activity android:name="CombinedBookmarkHistoryActivity" android:label="@string/bookmarks"
+ android:excludeFromRecents="true"
android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"
android:theme="@style/BookmarkTheme" >
<meta-data android:name="android.app.default_searchable"
android:value=".BrowserActivity" />
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
</activity>
<activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks"
diff --git a/res/drawable-hdpi/search_plate_browser.9.png b/res/drawable-hdpi/search_plate_browser.9.png
index f078259..cf0567b 100644
--- a/res/drawable-hdpi/search_plate_browser.9.png
+++ b/res/drawable-hdpi/search_plate_browser.9.png
Binary files differ
diff --git a/res/drawable-mdpi/search_plate_browser.9.png b/res/drawable-mdpi/search_plate_browser.9.png
index 0436dcf..2370d9c 100644
--- a/res/drawable-mdpi/search_plate_browser.9.png
+++ b/res/drawable-mdpi/search_plate_browser.9.png
Binary files differ
diff --git a/res/drawable/stop_background.xml b/res/drawable/stop_background.xml
new file mode 100644
index 0000000..a9a4dd4
--- /dev/null
+++ b/res/drawable/stop_background.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<!-- Custom background for the stop button which mimics btn_search_dialog
+ but draws in a pressed state even if it is in an unfocused window -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@*android:drawable/btn_search_dialog_pressed" />
+ <item android:state_pressed="false"
+ android:drawable="@*android:drawable/btn_search_dialog_default" />
+</selector>
diff --git a/res/layout/browser_download_item.xml b/res/layout/browser_download_item.xml
index cb8a690..52f49c1 100644
--- a/res/layout/browser_download_item.xml
+++ b/res/layout/browser_download_item.xml
@@ -21,7 +21,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingRight="?android:attr/scrollbarSize"
+ >
<ImageView android:id="@+id/download_icon"
android:layout_width="@android:dimen/app_icon_size"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 3765024..c251250 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -73,7 +73,7 @@
/>
</LinearLayout>
<ImageView android:id="@+id/stop"
- android:background="@*android:drawable/btn_search_dialog"
+ android:background="@drawable/stop_background"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_btn_stop_v2"
diff --git a/res/layout/title_bar_bg.xml b/res/layout/title_bar_bg.xml
deleted file mode 100644
index 1dbc5e5..0000000
--- a/res/layout/title_bar_bg.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2009, 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="vertical"
- >
- <view class="com.android.browser.BrowserActivity$Shadow"
- android:id="@+id/shadow"
- android:layout_height="5dip"
- android:layout_width="match_parent"
- android:background="@*android:drawable/title_bar_shadow"
- />
-</LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0a74782..5e60b2d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Prohlížeč"</string>
<string name="choose_upload" msgid="3649366287575002063">"Zvolit soubor, který chcete nahrát."</string>
<string name="new_tab" msgid="4505722538297295141">"Nové okno"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Platnost:"</string>
<string name="issued_on" msgid="2082890654801808368">"Datum vydání:"</string>
<string name="expires_on" msgid="8061200430557020704">"Platnost vyprší:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Načítání podrobností pro přihlášení..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Zastavuji..."</string>
<string name="stop" msgid="5687251076030630074">"Zastavit"</string>
<string name="reload" msgid="8585220783228408062">"Obnovit"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 69808dd..26ff5a7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Vælg fil til upload"</string>
<string name="new_tab" msgid="4505722538297295141">"Nyt vindue"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Gyldighed:"</string>
<string name="issued_on" msgid="2082890654801808368">"Udstedt den:"</string>
<string name="expires_on" msgid="8061200430557020704">"Udløber den:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Henter loginoplysninger ..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Stopper ..."</string>
<string name="stop" msgid="5687251076030630074">"Stop"</string>
<string name="reload" msgid="8585220783228408062">"Opdater"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1d91903..98dd364 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Datei zum Hochladen auswählen"</string>
<string name="new_tab" msgid="4505722538297295141">"Neues Fenster"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Gültigkeit:"</string>
<string name="issued_on" msgid="2082890654801808368">"Ausgegeben am:"</string>
<string name="expires_on" msgid="8061200430557020704">"Läuft ab am:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Anmeldedetails werden abgerufen…"</string>
+
<string name="stopping" msgid="4839698519340302982">"Wird angehalten..."</string>
<string name="stop" msgid="5687251076030630074">"Anhalten"</string>
<string name="reload" msgid="8585220783228408062">"Aktualisieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 37ad0ed..29eea4e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Internet"</string>
<string name="choose_upload" msgid="3649366287575002063">"Επιλογή αρχείου για μεταφόρτωση"</string>
<string name="new_tab" msgid="4505722538297295141">"Νέο παράθυρο"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Ισχύς:"</string>
<string name="issued_on" msgid="2082890654801808368">"Εκδόθηκε στις:"</string>
<string name="expires_on" msgid="8061200430557020704">"Λήγει:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Ανάκτηση λεπτομερειών σύνδεσης..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Διακοπή..."</string>
<string name="stop" msgid="5687251076030630074">"Διακοπή"</string>
<string name="reload" msgid="8585220783228408062">"Ανανέωση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1f820e0..15c40d9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Elegir el archivo para cargar"</string>
<string name="new_tab" msgid="4505722538297295141">"Ventana nueva"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Validez:"</string>
<string name="issued_on" msgid="2082890654801808368">"Enviado el:"</string>
<string name="expires_on" msgid="8061200430557020704">"Expira el:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Recuperando detalles de inicio de sesión..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Deteniendo..."</string>
<string name="stop" msgid="5687251076030630074">"Detener"</string>
<string name="reload" msgid="8585220783228408062">"Actualizar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0e6decd..ae7ea88 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Seleccionar archivo para subir"</string>
<string name="new_tab" msgid="4505722538297295141">"Nueva ventana"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Validez:"</string>
<string name="issued_on" msgid="2082890654801808368">"Fecha de emisión:"</string>
<string name="expires_on" msgid="8061200430557020704">"Fecha de caducidad:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Recuperando detalles de acceso..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Deteniendo..."</string>
<string name="stop" msgid="5687251076030630074">"Detener"</string>
<string name="reload" msgid="8585220783228408062">"Actualizar"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f3d79ea..55c83de 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navigateur"</string>
<string name="choose_upload" msgid="3649366287575002063">"Choisir le fichier à importer"</string>
<string name="new_tab" msgid="4505722538297295141">"Nouvelle fenêtre"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Validité :"</string>
<string name="issued_on" msgid="2082890654801808368">"Émis le :"</string>
<string name="expires_on" msgid="8061200430557020704">"Expire le :"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Récupération des données de connexion..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Arrêt..."</string>
<string name="stop" msgid="5687251076030630074">"Interrompre"</string>
<string name="reload" msgid="8585220783228408062">"Actualiser"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9c63e4f..18ee548 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Scegli il file per il caricamento"</string>
<string name="new_tab" msgid="4505722538297295141">"Nuova finestra"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Validità:"</string>
<string name="issued_on" msgid="2082890654801808368">"Rilasciato il:"</string>
<string name="expires_on" msgid="8061200430557020704">"Scade il:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Recupero dettagli di accesso..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Interruzione..."</string>
<string name="stop" msgid="5687251076030630074">"Interrompi"</string>
<string name="reload" msgid="8585220783228408062">"Aggiorna"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9a03fae..0f8a340 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"ブラウザ"</string>
<string name="choose_upload" msgid="3649366287575002063">"アップロードするファイルを選択"</string>
<string name="new_tab" msgid="4505722538297295141">"新しいウィンドウ"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"有効期間:"</string>
<string name="issued_on" msgid="2082890654801808368">"発行:"</string>
<string name="expires_on" msgid="8061200430557020704">"有効期限:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"ログイン詳細を取得中..."</string>
+
<string name="stopping" msgid="4839698519340302982">"停止中..."</string>
<string name="stop" msgid="5687251076030630074">"停止"</string>
<string name="reload" msgid="8585220783228408062">"再読み込み"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ff9233f..87ffbe8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"인터넷"</string>
<string name="choose_upload" msgid="3649366287575002063">"업로드할 파일 선택"</string>
<string name="new_tab" msgid="4505722538297295141">"새 창"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"유효성:"</string>
<string name="issued_on" msgid="2082890654801808368">"발급 날짜:"</string>
<string name="expires_on" msgid="8061200430557020704">"만료 날짜:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"로그인 세부정보를 가져오는 중..."</string>
+
<string name="stopping" msgid="4839698519340302982">"중지하는 중..."</string>
<string name="stop" msgid="5687251076030630074">"중지"</string>
<string name="reload" msgid="8585220783228408062">"새로고침"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 318e2f6..da9945e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Nettleser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Velg fil for opplasting"</string>
<string name="new_tab" msgid="4505722538297295141">"Ny fane"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Gyldighet:"</string>
<string name="issued_on" msgid="2082890654801808368">"Utstedt:"</string>
<string name="expires_on" msgid="8061200430557020704">"Utløper den:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Henter påloggingsinformasjon…"</string>
+
<string name="stopping" msgid="4839698519340302982">"Avbryter…"</string>
<string name="stop" msgid="5687251076030630074">"Avbryt"</string>
<string name="reload" msgid="8585220783228408062">"Oppdater"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6c82a1a..d28dbaf 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Bestand selecteren voor uploaden"</string>
<string name="new_tab" msgid="4505722538297295141">"Nieuw venster"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Geldigheid:"</string>
<string name="issued_on" msgid="2082890654801808368">"Uitgegeven op:"</string>
<string name="expires_on" msgid="8061200430557020704">"Verloopt op:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Aanmeldingsgegevens ophalen..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Stoppen..."</string>
<string name="stop" msgid="5687251076030630074">"Stoppen"</string>
<string name="reload" msgid="8585220783228408062">"Vernieuwen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0b7a43b..22c6c2a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Internet"</string>
<string name="choose_upload" msgid="3649366287575002063">"Wybierz plik do przesłania"</string>
<string name="new_tab" msgid="4505722538297295141">"Nowe okno"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Poprawność:"</string>
<string name="issued_on" msgid="2082890654801808368">"Data wystawienia:"</string>
<string name="expires_on" msgid="8061200430557020704">"Wygasa:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Pobieranie szczegółów logowania…"</string>
+
<string name="stopping" msgid="4839698519340302982">"Trwa zatrzymywanie…"</string>
<string name="stop" msgid="5687251076030630074">"Zatrzymaj"</string>
<string name="reload" msgid="8585220783228408062">"Odśwież"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 61514f7..d4e3527 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Escolher ficheiro a carregar"</string>
<string name="new_tab" msgid="4505722538297295141">"Nova janela"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Validade:"</string>
<string name="issued_on" msgid="2082890654801808368">"Emitido em:"</string>
<string name="expires_on" msgid="8061200430557020704">"Expira em:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"A obter detalhes de início de sessão..."</string>
+
<string name="stopping" msgid="4839698519340302982">"A interromper..."</string>
<string name="stop" msgid="5687251076030630074">"Parar"</string>
<string name="reload" msgid="8585220783228408062">"Actualizar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6cf46aa..cbeab9a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Escolha o arquivo para envio"</string>
<string name="new_tab" msgid="4505722538297295141">"Nova janela"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Validade:"</string>
<string name="issued_on" msgid="2082890654801808368">"Emitido em:"</string>
<string name="expires_on" msgid="8061200430557020704">"Expira em:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Recuperando detalhes do login…"</string>
+
<string name="stopping" msgid="4839698519340302982">"Parando…"</string>
<string name="stop" msgid="5687251076030630074">"Parar"</string>
<string name="reload" msgid="8585220783228408062">"Atualizar"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 47356a6..096d5a5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Браузер"</string>
<string name="choose_upload" msgid="3649366287575002063">"Выберите файл для загрузки"</string>
<string name="new_tab" msgid="4505722538297295141">"Новое окно"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Срок действия:"</string>
<string name="issued_on" msgid="2082890654801808368">"Дата издания:"</string>
<string name="expires_on" msgid="8061200430557020704">"Дата окончания действия:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Получение регистрационной информации..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Остановка..."</string>
<string name="stop" msgid="5687251076030630074">"Стоп"</string>
<string name="reload" msgid="8585220783228408062">"Обновить"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5b783b7..52cdf42 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Webbläs."</string>
<string name="choose_upload" msgid="3649366287575002063">"Välj filen som du vill överföra"</string>
<string name="new_tab" msgid="4505722538297295141">"Nytt fönster"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Giltighet:"</string>
<string name="issued_on" msgid="2082890654801808368">"Utfärdat den:"</string>
<string name="expires_on" msgid="8061200430557020704">"Upphör att gälla:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Hämtar inloggningsuppgifter…"</string>
+
<string name="stopping" msgid="4839698519340302982">"Avbryter…"</string>
<string name="stop" msgid="5687251076030630074">"Stoppa"</string>
<string name="reload" msgid="8585220783228408062">"Uppdatera"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b75ff15..d0c1fca 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Tarayıcı"</string>
<string name="choose_upload" msgid="3649366287575002063">"Yükleme için dosya seçin"</string>
<string name="new_tab" msgid="4505722538297295141">"Yeni pencere"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"Geçerlilik:"</string>
<string name="issued_on" msgid="2082890654801808368">"Yayınlanma tarihi:"</string>
<string name="expires_on" msgid="8061200430557020704">"Sona erme tarihi:"</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"Oturum açma bilgileri alınıyor..."</string>
+
<string name="stopping" msgid="4839698519340302982">"Durduruluyor..."</string>
<string name="stop" msgid="5687251076030630074">"Durdur"</string>
<string name="reload" msgid="8585220783228408062">"Yenile"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f25bd1e..77415dc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"浏览器"</string>
<string name="choose_upload" msgid="3649366287575002063">"选择要上传的文件"</string>
<string name="new_tab" msgid="4505722538297295141">"新窗口"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"有效期："</string>
<string name="issued_on" msgid="2082890654801808368">"颁发时间："</string>
<string name="expires_on" msgid="8061200430557020704">"有效期至："</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"正在检索登录详细信息..."</string>
+
<string name="stopping" msgid="4839698519340302982">"正在停止..."</string>
<string name="stop" msgid="5687251076030630074">"停止"</string>
<string name="reload" msgid="8585220783228408062">"刷新"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 00bdadc..2b86da3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"瀏覽器"</string>
<string name="choose_upload" msgid="3649366287575002063">"選擇要上載的檔案"</string>
<string name="new_tab" msgid="4505722538297295141">"新視窗"</string>
@@ -60,7 +58,7 @@
<string name="validity_period" msgid="57988851973181309">"合法性："</string>
<string name="issued_on" msgid="2082890654801808368">"發給："</string>
<string name="expires_on" msgid="8061200430557020704">"有效日期："</string>
- <string name="retrieving_creds_dlg_msg" msgid="9207671133094039879">"擷取登入資訊…"</string>
+
<string name="stopping" msgid="4839698519340302982">"停止中…"</string>
<string name="stop" msgid="5687251076030630074">"停止"</string>
<string name="reload" msgid="8585220783228408062">"重新整理"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 646c703..1b02aac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,8 +118,6 @@
<!-- Label for an information field on an SSL Certificate Dialog -->
<string name="expires_on">Expires on:</string>
- <!-- Dialog that is shown while we are retrieving the login creds from the system -->
- <string name="retrieving_creds_dlg_msg">Retrieving sign-in details\u2026</string>
<!-- Toast informing the user that loading has stopped for the current page. -->
<string name="stopping">Stopping\u2026</string>
<!-- Menu item to stop the current page from loading. -->
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index cbf78d6..1f15186 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -747,19 +747,6 @@
private TitleBar mFakeTitleBar;
/**
- * Holder for the fake title bar. It will have a foreground shadow, as well
- * as a white background, so the fake title bar looks like the real one.
- */
- private ViewGroup mFakeTitleBarHolder;
-
- /**
- * Layout parameters for the fake title bar within mFakeTitleBarHolder
- */
- private FrameLayout.LayoutParams mFakeTitleBarParams
- = new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT);
- /**
* Keeps track of whether the options menu is open. This is important in
* determining whether to show or hide the title bar overlay.
*/
@@ -813,33 +800,6 @@
return true;
}
- /**
- * Special class used exclusively for the shadow drawn underneath the fake
- * title bar. The shadow does not need to be drawn if the WebView
- * underneath is scrolled to the top, because it will draw directly on top
- * of the embedded shadow.
- */
- private static class Shadow extends View {
- private WebView mWebView;
-
- public Shadow(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public void setWebView(WebView view) {
- mWebView = view;
- }
-
- @Override
- public void draw(Canvas canvas) {
- // In general onDraw is the method to override, but we care about
- // whether or not the background gets drawn, which happens in draw()
- if (mWebView == null || mWebView.getScrollY() > getHeight()) {
- super.draw(canvas);
- }
- }
- }
-
private void showFakeTitleBar() {
final View decor = getWindow().peekDecorView();
if (mFakeTitleBar.getParent() == null && mActiveTabsPage == null
@@ -873,17 +833,7 @@
// placed underneath the status bar. Use the global visible rect
// of mBrowserFrameLayout to determine the bottom of the status bar
params.y = visRect.top;
- // Add a holder for the title bar. It also holds a shadow to show
- // below the title bar.
- if (mFakeTitleBarHolder == null) {
- mFakeTitleBarHolder = (ViewGroup) LayoutInflater.from(this)
- .inflate(R.layout.title_bar_bg, null);
- }
- Shadow shadow = (Shadow) mFakeTitleBarHolder.findViewById(
- R.id.shadow);
- shadow.setWebView(mainView);
- mFakeTitleBarHolder.addView(mFakeTitleBar, 0, mFakeTitleBarParams);
- manager.addView(mFakeTitleBarHolder, params);
+ manager.addView(mFakeTitleBar, params);
}
}
@@ -903,7 +853,7 @@
private void hideFakeTitleBar() {
if (mFakeTitleBar.getParent() == null) return;
WindowManager.LayoutParams params = (WindowManager.LayoutParams)
- mFakeTitleBarHolder.getLayoutParams();
+ mFakeTitleBar.getLayoutParams();
WebView mainView = mTabControl.getCurrentWebView();
// Although we decided whether or not to animate based on the current
// scroll position, the scroll position may have changed since the
@@ -913,9 +863,8 @@
? 0 : R.style.TitleBar;
WindowManager manager
= (WindowManager) getSystemService(Context.WINDOW_SERVICE);
- manager.updateViewLayout(mFakeTitleBarHolder, params);
- mFakeTitleBarHolder.removeView(mFakeTitleBar);
- manager.removeView(mFakeTitleBarHolder);
+ manager.updateViewLayout(mFakeTitleBar, params);
+ manager.removeView(mFakeTitleBar);
}
/**
@@ -3786,7 +3735,7 @@
private boolean mIsNetworkUp;
private boolean mDidStopLoad;
- private boolean mActivityInPause = true;
+ /* package */ boolean mActivityInPause = true;
private boolean mMenuIsDown;
diff --git a/src/com/android/browser/BrowserDownloadPage.java b/src/com/android/browser/BrowserDownloadPage.java
index 6a5ef28..18faf8b 100644
--- a/src/com/android/browser/BrowserDownloadPage.java
+++ b/src/com/android/browser/BrowserDownloadPage.java
@@ -102,7 +102,6 @@
Downloads.Impl.COLUMN_LAST_MODIFICATION));
setListAdapter(mDownloadAdapter);
- mListView.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
mListView.setOnCreateContextMenuListener(this);
Intent intent = getIntent();
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 6b05dcd..f58478f 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -207,8 +207,8 @@
s.setNeedInitialFocus(false);
// Browser supports multiple windows
s.setSupportMultipleWindows(true);
- // Use system over scroll background
- s.setUseSystemOverscrollBackground(true);
+ // Use internal pattern for over scroll background
+ s.setUseWebViewBackgroundForOverscrollBackground(false);
// HTML5 API flags
s.setAppCacheEnabled(b.appCacheEnabled);
@@ -257,10 +257,14 @@
// the cost of one cached page is ~3M (measured using nytimes.com). For
// low end devices, we only cache one page. For high end devices, we try
// to cache more pages, currently choose 5.
+ //
+ // Note: the page cache is disabled on high-end devices due to an
+ // incompatibility with V8. TODO: re-enable the page cache once the
+ // problem with V8 is solved.
ActivityManager am = (ActivityManager) ctx
.getSystemService(Context.ACTIVITY_SERVICE);
if (am.getMemoryClass() > 16) {
- pageCacheCapacity = 5;
+ pageCacheCapacity = 0;
} else {
pageCacheCapacity = 1;
}
diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
index c435239..194956f 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
@@ -100,25 +100,30 @@
Bundle extras = getIntent().getExtras();
Intent bookmarksIntent = new Intent(this, BrowserBookmarksPage.class);
- bookmarksIntent.putExtras(extras);
+ if (extras != null) {
+ bookmarksIntent.putExtras(extras);
+ }
createTab(bookmarksIntent, R.string.tab_bookmarks,
R.drawable.browser_bookmark_tab, BOOKMARKS_TAB);
Intent visitedIntent = new Intent(this, BrowserBookmarksPage.class);
// Need to copy extras so the bookmarks activity and this one will be
// different
- Bundle visitedExtras = new Bundle(extras);
+ Bundle visitedExtras = extras == null ? new Bundle() : new Bundle(extras);
visitedExtras.putBoolean("mostVisited", true);
visitedIntent.putExtras(visitedExtras);
createTab(visitedIntent, R.string.tab_most_visited,
R.drawable.browser_visited_tab, VISITED_TAB);
Intent historyIntent = new Intent(this, BrowserHistoryPage.class);
- historyIntent.putExtras(extras);
+ String defaultTab = null;
+ if (extras != null) {
+ historyIntent.putExtras(extras);
+ defaultTab = extras.getString(STARTING_TAB);
+ }
createTab(historyIntent, R.string.tab_history,
R.drawable.browser_history_tab, HISTORY_TAB);
- String defaultTab = extras.getString(STARTING_TAB);
if (defaultTab != null) {
getTabHost().setCurrentTab(2);
}
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 84bb018..a5dc975 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -801,7 +801,7 @@
@Override
public void onUnhandledKeyEvent(WebView view, KeyEvent event) {
- if (!mInForeground) {
+ if (!mInForeground || mActivity.mActivityInPause) {
return;
}
if (event.isDown()) {
@@ -1417,8 +1417,11 @@
mSubViewContainer = mInflateService.inflate(
R.layout.browser_subwindow, null);
mSubView = (WebView) mSubViewContainer.findViewById(R.id.webview);
+ mSubView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
// use trackball directly
mSubView.setMapTrackballToArrowKeys(false);
+ // Enable the built-in zoom
+ mSubView.getSettings().setBuiltInZoomControls(true);
mSubView.setWebViewClient(new SubWindowClient(mWebViewClient));
mSubView.setWebChromeClient(new SubWindowChromeClient(
mWebChromeClient));
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index ee6aa9c..0f19864 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -156,13 +156,14 @@
@Override
public boolean onTouchEvent(MotionEvent event) {
+ ImageView button = mInLoad ? mStopButton : mRtButton;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
// Make all touches hit either the textfield or the button,
// depending on which side of the right edge of the textfield
// they hit.
if ((int) event.getX() > mTitleBg.getRight()) {
- mRtButton.setPressed(true);
+ button.setPressed(true);
} else {
mTitleBg.setPressed(true);
mHandler.sendMessageDelayed(mHandler.obtainMessage(
@@ -178,7 +179,7 @@
// other is pressed. Since the user moved off the title
// bar, mark both as not pressed.
mTitleBg.setPressed(false);
- mRtButton.setPressed(false);
+ button.setPressed(false);
mHandler.removeMessages(LONG_PRESS);
break;
}
@@ -187,17 +188,17 @@
if (mTitleBg.isPressed() && x > titleRight + slop) {
mTitleBg.setPressed(false);
mHandler.removeMessages(LONG_PRESS);
- } else if (mRtButton.isPressed() && x < titleRight - slop) {
- mRtButton.setPressed(false);
+ } else if (button.isPressed() && x < titleRight - slop) {
+ button.setPressed(false);
}
break;
case MotionEvent.ACTION_CANCEL:
- mRtButton.setPressed(false);
+ button.setPressed(false);
mTitleBg.setPressed(false);
mHandler.removeMessages(LONG_PRESS);
break;
case MotionEvent.ACTION_UP:
- if (mRtButton.isPressed()) {
+ if (button.isPressed()) {
if (mInVoiceMode) {
if (mBrowserActivity.getTabControl().getCurrentTab()
.voiceSearchSourceIsGoogle()) {
@@ -213,7 +214,7 @@
} else {
mBrowserActivity.bookmarksOrHistoryPicker(false);
}
- mRtButton.setPressed(false);
+ button.setPressed(false);
} else if (mTitleBg.isPressed()) {
mHandler.removeMessages(LONG_PRESS);
if (mInVoiceMode) {
