diff options
131 files changed, 550 insertions, 475 deletions
diff --git a/res/drawable-hdpi/bg_bookmark_widget_holo.9.png b/res/drawable-hdpi/bg_bookmark_widget_holo.9.png Binary files differdeleted file mode 100644 index adb57a4..0000000 --- a/res/drawable-hdpi/bg_bookmark_widget_holo.9.png +++ /dev/null diff --git a/res/drawable-hdpi/bg_bookmarks_widget_holo.9.png b/res/drawable-hdpi/bg_bookmarks_widget_holo.9.png Binary files differnew file mode 100644 index 0000000..4fd263f --- /dev/null +++ b/res/drawable-hdpi/bg_bookmarks_widget_holo.9.png diff --git a/res/drawable-hdpi/browser_widget_preview.png b/res/drawable-hdpi/browser_widget_preview.png Binary files differnew file mode 100644 index 0000000..4ee806b --- /dev/null +++ b/res/drawable-hdpi/browser_widget_preview.png diff --git a/res/drawable-hdpi/browsertab_add_focused.png b/res/drawable-hdpi/browsertab_add_focused.png Binary files differnew file mode 100644 index 0000000..1490a61 --- /dev/null +++ b/res/drawable-hdpi/browsertab_add_focused.png diff --git a/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png b/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png Binary files differdeleted file mode 100644 index 5f975e5..0000000 --- a/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png b/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png Binary files differdeleted file mode 100644 index 722f3b8..0000000 --- a/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png b/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png Binary files differdeleted file mode 100644 index e583acd..0000000 --- a/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_btn_copy.png b/res/drawable-hdpi/ic_btn_copy.png Binary files differdeleted file mode 100644 index 847cf7e..0000000 --- a/res/drawable-hdpi/ic_btn_copy.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_btn_find.png b/res/drawable-hdpi/ic_btn_find.png Binary files differdeleted file mode 100644 index 0da38a1..0000000 --- a/res/drawable-hdpi/ic_btn_find.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_btn_select_all.png b/res/drawable-hdpi/ic_btn_select_all.png Binary files differdeleted file mode 100644 index 9545a53..0000000 --- a/res/drawable-hdpi/ic_btn_select_all.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_btn_stop_v2.png b/res/drawable-hdpi/ic_btn_stop_v2.png Binary files differdeleted file mode 100644 index 2c97223..0000000 --- a/res/drawable-hdpi/ic_btn_stop_v2.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_clear_search.png b/res/drawable-hdpi/ic_clear_search.png Binary files differdeleted file mode 100644 index e8e67b4..0000000 --- a/res/drawable-hdpi/ic_clear_search.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_history_holo_dark.png b/res/drawable-hdpi/ic_history_holo_dark.png Binary files differdeleted file mode 100644 index 7972a81..0000000 --- a/res/drawable-hdpi/ic_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_most_visited_holo_dark.png b/res/drawable-hdpi/ic_most_visited_holo_dark.png Binary files differdeleted file mode 100644 index bbb0bf6..0000000 --- a/res/drawable-hdpi/ic_most_visited_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_back.png b/res/drawable-hdpi/ic_pie_back.png Binary files differdeleted file mode 100644 index 32b3ea7..0000000 --- a/res/drawable-hdpi/ic_pie_back.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_bookmarks.png b/res/drawable-hdpi/ic_pie_bookmarks.png Binary files differdeleted file mode 100644 index 2536856..0000000 --- a/res/drawable-hdpi/ic_pie_bookmarks.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_close_tab.png b/res/drawable-hdpi/ic_pie_close_tab.png Binary files differdeleted file mode 100644 index 108f8da..0000000 --- a/res/drawable-hdpi/ic_pie_close_tab.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_forward.png b/res/drawable-hdpi/ic_pie_forward.png Binary files differdeleted file mode 100644 index 4e5f08e..0000000 --- a/res/drawable-hdpi/ic_pie_forward.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_more.png b/res/drawable-hdpi/ic_pie_more.png Binary files differdeleted file mode 100644 index 0833ee2..0000000 --- a/res/drawable-hdpi/ic_pie_more.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_new_tab.png b/res/drawable-hdpi/ic_pie_new_tab.png Binary files differdeleted file mode 100644 index 18f49ef..0000000 --- a/res/drawable-hdpi/ic_pie_new_tab.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_refresh.png b/res/drawable-hdpi/ic_pie_refresh.png Binary files differdeleted file mode 100644 index f0a5d7a..0000000 --- a/res/drawable-hdpi/ic_pie_refresh.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_search.png b/res/drawable-hdpi/ic_pie_search.png Binary files differdeleted file mode 100644 index f1c8825..0000000 --- a/res/drawable-hdpi/ic_pie_search.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pie_tabs.png b/res/drawable-hdpi/ic_pie_tabs.png Binary files differdeleted file mode 100644 index b941285..0000000 --- a/res/drawable-hdpi/ic_pie_tabs.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_thumbnail_view_holo_dark.png b/res/drawable-hdpi/ic_thumbnail_view_holo_dark.png Binary files differnew file mode 100644 index 0000000..514b7dc --- /dev/null +++ b/res/drawable-hdpi/ic_thumbnail_view_holo_dark.png diff --git a/res/drawable-hdpi/list_divider_vert.9.png b/res/drawable-hdpi/list_divider_vert.9.png Binary files differdeleted file mode 100644 index d99730a..0000000 --- a/res/drawable-hdpi/list_divider_vert.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_indicator.png b/res/drawable-hdpi/page_indicator.png Binary files differdeleted file mode 100644 index d00b900..0000000 --- a/res/drawable-hdpi/page_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/page_indicator_unselected2.png b/res/drawable-hdpi/page_indicator_unselected2.png Binary files differdeleted file mode 100644 index a34fd2e..0000000 --- a/res/drawable-hdpi/page_indicator_unselected2.png +++ /dev/null diff --git a/res/drawable-hdpi/qc_background_normal.png b/res/drawable-hdpi/qc_background_normal.png Binary files differnew file mode 100644 index 0000000..fec04f2 --- /dev/null +++ b/res/drawable-hdpi/qc_background_normal.png diff --git a/res/drawable-hdpi/search_plate_browser.9.png b/res/drawable-hdpi/search_plate_browser.9.png Binary files differdeleted file mode 100644 index cf0567b..0000000 --- a/res/drawable-hdpi/search_plate_browser.9.png +++ /dev/null diff --git a/res/drawable-hdpi/tab_nr.png b/res/drawable-hdpi/tab_nr.png Binary files differnew file mode 100644 index 0000000..d9e74d5 --- /dev/null +++ b/res/drawable-hdpi/tab_nr.png diff --git a/res/drawable-hdpi/text_field_results.9.png b/res/drawable-hdpi/text_field_results.9.png Binary files differdeleted file mode 100644 index bd4bcc5..0000000 --- a/res/drawable-hdpi/text_field_results.9.png +++ /dev/null diff --git a/res/drawable-hdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png b/res/drawable-hdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png Binary files differnew file mode 100644 index 0000000..9d55e98 --- /dev/null +++ b/res/drawable-hdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png diff --git a/res/drawable-hdpi/urlbar_bg.9.png b/res/drawable-hdpi/urlbar_bg.9.png Binary files differdeleted file mode 100644 index c35383e..0000000 --- a/res/drawable-hdpi/urlbar_bg.9.png +++ /dev/null diff --git a/res/drawable-mdpi/bg_bookmark_widget_holo.9.png b/res/drawable-mdpi/bg_bookmark_widget_holo.9.png Binary files differdeleted file mode 100644 index d95f8d3..0000000 --- a/res/drawable-mdpi/bg_bookmark_widget_holo.9.png +++ /dev/null diff --git a/res/drawable/browser_widget_preview.png b/res/drawable-mdpi/browser_widget_preview.png Binary files differindex 7a2af05..7a2af05 100644 --- a/res/drawable/browser_widget_preview.png +++ b/res/drawable-mdpi/browser_widget_preview.png diff --git a/res/drawable-mdpi/btn_ic_back_bookmark_widget_holo_dark.png b/res/drawable-mdpi/btn_ic_back_bookmark_widget_holo_dark.png Binary files differdeleted file mode 100644 index d8697b8..0000000 --- a/res/drawable-mdpi/btn_ic_back_bookmark_widget_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png b/res/drawable-mdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png Binary files differdeleted file mode 100644 index 21a2cc3..0000000 --- a/res/drawable-mdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_browser_bookmark_widget_holo.png b/res/drawable-mdpi/ic_browser_bookmark_widget_holo.png Binary files differdeleted file mode 100644 index 0d9e49d..0000000 --- a/res/drawable-mdpi/ic_browser_bookmark_widget_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_btn_copy.png b/res/drawable-mdpi/ic_btn_copy.png Binary files differdeleted file mode 100644 index 2174368..0000000 --- a/res/drawable-mdpi/ic_btn_copy.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_btn_find.png b/res/drawable-mdpi/ic_btn_find.png Binary files differdeleted file mode 100644 index 71bc61a..0000000 --- a/res/drawable-mdpi/ic_btn_find.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_btn_select_all.png b/res/drawable-mdpi/ic_btn_select_all.png Binary files differdeleted file mode 100644 index 8ce8c8f..0000000 --- a/res/drawable-mdpi/ic_btn_select_all.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_btn_stop_v2.png b/res/drawable-mdpi/ic_btn_stop_v2.png Binary files differdeleted file mode 100644 index 89f01e7..0000000 --- a/res/drawable-mdpi/ic_btn_stop_v2.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_clear_search.png b/res/drawable-mdpi/ic_clear_search.png Binary files differdeleted file mode 100644 index e8e67b4..0000000 --- a/res/drawable-mdpi/ic_clear_search.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_history_holo_dark.png b/res/drawable-mdpi/ic_history_holo_dark.png Binary files differdeleted file mode 100644 index 44f2245..0000000 --- a/res/drawable-mdpi/ic_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_most_visited_holo_dark.png b/res/drawable-mdpi/ic_most_visited_holo_dark.png Binary files differdeleted file mode 100644 index 52082bd..0000000 --- a/res/drawable-mdpi/ic_most_visited_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_back.png b/res/drawable-mdpi/ic_pie_back.png Binary files differdeleted file mode 100644 index daddaea..0000000 --- a/res/drawable-mdpi/ic_pie_back.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_bookmarks.png b/res/drawable-mdpi/ic_pie_bookmarks.png Binary files differdeleted file mode 100644 index ffa430d..0000000 --- a/res/drawable-mdpi/ic_pie_bookmarks.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_close_tab.png b/res/drawable-mdpi/ic_pie_close_tab.png Binary files differdeleted file mode 100644 index 62396f4..0000000 --- a/res/drawable-mdpi/ic_pie_close_tab.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_forward.png b/res/drawable-mdpi/ic_pie_forward.png Binary files differdeleted file mode 100644 index bd8dcac..0000000 --- a/res/drawable-mdpi/ic_pie_forward.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_more.png b/res/drawable-mdpi/ic_pie_more.png Binary files differdeleted file mode 100644 index c96c6a4..0000000 --- a/res/drawable-mdpi/ic_pie_more.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_new_tab.png b/res/drawable-mdpi/ic_pie_new_tab.png Binary files differdeleted file mode 100644 index 206675a..0000000 --- a/res/drawable-mdpi/ic_pie_new_tab.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_refresh.png b/res/drawable-mdpi/ic_pie_refresh.png Binary files differdeleted file mode 100644 index 5980f8b..0000000 --- a/res/drawable-mdpi/ic_pie_refresh.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_search.png b/res/drawable-mdpi/ic_pie_search.png Binary files differdeleted file mode 100644 index 6981697..0000000 --- a/res/drawable-mdpi/ic_pie_search.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_tabs.png b/res/drawable-mdpi/ic_pie_tabs.png Binary files differdeleted file mode 100644 index fda262a..0000000 --- a/res/drawable-mdpi/ic_pie_tabs.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pie_web.png b/res/drawable-mdpi/ic_pie_web.png Binary files differdeleted file mode 100644 index 86e41ff..0000000 --- a/res/drawable-mdpi/ic_pie_web.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_thumbnail_view_holo_dark.png b/res/drawable-mdpi/ic_thumbnail_view_holo_dark.png Binary files differnew file mode 100644 index 0000000..95c674d --- /dev/null +++ b/res/drawable-mdpi/ic_thumbnail_view_holo_dark.png diff --git a/res/drawable-mdpi/list_divider_vert.9.png b/res/drawable-mdpi/list_divider_vert.9.png Binary files differdeleted file mode 100644 index d99730a..0000000 --- a/res/drawable-mdpi/list_divider_vert.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_indicator.png b/res/drawable-mdpi/page_indicator.png Binary files differdeleted file mode 100644 index 73c030a..0000000 --- a/res/drawable-mdpi/page_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/page_indicator_unselected2.png b/res/drawable-mdpi/page_indicator_unselected2.png Binary files differdeleted file mode 100644 index 70818ee..0000000 --- a/res/drawable-mdpi/page_indicator_unselected2.png +++ /dev/null diff --git a/res/drawable-mdpi/search_plate_browser.9.png b/res/drawable-mdpi/search_plate_browser.9.png Binary files differdeleted file mode 100644 index 2370d9c..0000000 --- a/res/drawable-mdpi/search_plate_browser.9.png +++ /dev/null diff --git a/res/drawable-mdpi/text_field_results.9.png b/res/drawable-mdpi/text_field_results.9.png Binary files differdeleted file mode 100644 index 167c42d..0000000 --- a/res/drawable-mdpi/text_field_results.9.png +++ /dev/null diff --git a/res/drawable-mdpi/urlbar_bg.9.png b/res/drawable-mdpi/urlbar_bg.9.png Binary files differdeleted file mode 100644 index 18b49e7..0000000 --- a/res/drawable-mdpi/urlbar_bg.9.png +++ /dev/null diff --git a/res/layout-xlarge/history.xml b/res/layout-xlarge/history.xml new file mode 100644 index 0000000..2d949e1 --- /dev/null +++ b/res/layout-xlarge/history.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" +> + + <ViewStub + android:id="@+id/pref_stub" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:inflatedId="@+id/history" /> + + <TextView android:id="@android:id/empty" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="@string/empty_history" + android:visibility="gone" + /> + +</FrameLayout> diff --git a/res/layout/active_tabs.xml b/res/layout/active_tabs.xml index 8b5fe9e..f9bd6b0 100644 --- a/res/layout/active_tabs.xml +++ b/res/layout/active_tabs.xml @@ -14,31 +14,41 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="vertical" - android:background="@color/black" - > - <RelativeLayout - style="?android:attr/windowTitleBackgroundStyle" - android:layout_width="match_parent" - android:layout_height="?android:attr/windowTitleSize" - > - <TextView android:id="@android:id/title" - style="?android:attr/windowTitleStyle" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@null" - android:fadingEdge="horizontal" - android:gravity="center_vertical" - android:text="@string/active_tabs" - /> - </RelativeLayout> - <ListView android:id="@+id/list" +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <Button + android:id="@+id/new_tab" + android:text="@string/new_tab" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <Button + android:id="@+id/new_incognito_tab" + android:text="@string/new_incognito_tab" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceSmall" + android:paddingLeft="0dip" + android:paddingRight="0dip" /> + + </LinearLayout> + + <ListView + android:id="@android:id/list" android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:cacheColorHint="@color/black" - /> -</LinearLayout> + android:layout_height="match_parent" + android:listSelector="@drawable/bookmark_thumb_selector" + android:drawSelectorOnTop="true" + android:focusable="true" + android:focusableInTouchMode="true" /> + +</merge> diff --git a/res/layout/history.xml b/res/layout/history.xml index f7d2c7c..f3adb51 100644 --- a/res/layout/history.xml +++ b/res/layout/history.xml @@ -19,11 +19,10 @@ android:layout_height="match_parent" > - <ViewStub - android:id="@+id/pref_stub" + <ExpandableListView + android:id="@+id/history" android:layout_height="match_parent" - android:layout_width="match_parent" - android:inflatedId="@+id/history" /> + android:layout_width="match_parent" /> <TextView android:id="@android:id/empty" android:layout_width="wrap_content" diff --git a/res/layout/tab_view.xml b/res/layout/tab_view.xml index 885f4cf..8ffb73d 100644 --- a/res/layout/tab_view.xml +++ b/res/layout/tab_view.xml @@ -20,42 +20,54 @@ android:layout_width="match_parent" android:orientation="horizontal" android:gravity="center_vertical" + android:paddingLeft="8dip" + android:paddingTop="4dip" + android:paddingBottom="4dip" > - <!-- This ImageView has the same width as the ImageView in - tab_view_add_tab.xml. --> - <ImageView android:id="@+id/favicon" - android:layout_width="20dip" - android:layout_height="20dip" - android:layout_marginLeft="18dip" - android:layout_marginRight="18dip" - android:background="@drawable/fav_icn_background" - android:padding="2dip"/> - <LinearLayout + <RelativeLayout + android:id="@+id/list_item" android:layout_width="0dip" - android:layout_height="wrap_content" android:layout_weight="1" - android:orientation="vertical" - > - <TextView android:id="@+id/title" + android:layout_height="wrap_content" + android:background="@drawable/bookmark_list_favicon_bg"> + <ImageView + android:id="@+id/thumb" + android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:maxLines="1" - android:singleLine="true" - android:ellipsize="end" - /> - <TextView android:id="@+id/url" + android:layout_height="@dimen/tab_view_thumbnail_height" + android:scaleType="fitXY" + android:cropToPadding="true" /> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:maxLines="1" - android:singleLine="true" - android:ellipsize="end" - /> - </LinearLayout> + android:layout_alignBottom="@id/thumb" + android:background="@color/tabViewTitleBackground"> + <ImageView + android:id="@+id/favicon" + android:src="@drawable/app_web_browser_sm" + android:layout_width="@dimen/favicon_size" + android:layout_height="@dimen/favicon_size" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4dip" + android:layout_marginRight="8dip" + android:layout_marginTop="4dip" + android:layout_marginBottom="4dip" + android:scaleType="fitXY" /> + <TextView + android:id="@+id/label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:singleLine="true" + android:ellipsize="end" + android:textSize="12sp" + android:typeface="sans" + android:textColor="@android:color/white" /> + </LinearLayout> + </RelativeLayout> <View android:id="@+id/divider" - android:background="#ff313431" - android:layout_width="1dip" + android:background="?android:attr/dividerVertical" + android:layout_width="1dp" android:layout_height="match_parent" android:layout_marginLeft="8dip" android:layout_marginTop="5dip" @@ -64,10 +76,10 @@ <view class="com.android.browser.ActiveTabsPage$CloseHolder" android:id="@+id/close" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingLeft="18dip" - android:paddingRight="18dip" - android:background="@drawable/close_background" - android:src="@drawable/btn_close_window" + android:paddingLeft="12dip" + android:paddingRight="12dip" + android:background="@drawable/bookmark_thumb_selector" + android:src="@drawable/ic_close_window_holo_dark" android:scaleType="center" /> </LinearLayout> diff --git a/res/layout/tab_view_add_incognito_tab.xml b/res/layout/tab_view_add_incognito_tab.xml deleted file mode 100644 index 43fcb43..0000000 --- a/res/layout/tab_view_add_incognito_tab.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="match_parent" - android:orientation="horizontal" - android:gravity="center_vertical" - > - <ImageView - android:layout_width="40dip" - android:layout_height="40dip" - android:layout_marginLeft="8dip" - android:layout_marginRight="8dip" - android:src="@drawable/ic_new_window_holo_dark"/> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:maxLines="1" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/new_incognito_tab" - /> -</LinearLayout> diff --git a/res/layout/tab_view_add_tab.xml b/res/layout/tab_view_add_tab.xml deleted file mode 100644 index f4e0f02..0000000 --- a/res/layout/tab_view_add_tab.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="match_parent" - android:orientation="horizontal" - android:gravity="center_vertical" - > - <ImageView - android:layout_width="40dip" - android:layout_height="40dip" - android:layout_marginLeft="8dip" - android:layout_marginRight="8dip" - android:src="@drawable/ic_new_window_holo_dark"/> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:maxLines="1" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/new_tab" - /> -</LinearLayout> diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index 99ac04d..34728d8 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -21,6 +21,7 @@ android:orientation="vertical" > <LinearLayout + android:id="@+id/taburlbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" diff --git a/res/menu/bookmark.xml b/res/menu/bookmark.xml index b761779..5517ab9 100644 --- a/res/menu/bookmark.xml +++ b/res/menu/bookmark.xml @@ -26,12 +26,15 @@ android:showAsAction="always" /> <item android:id="@+id/thumbnail_view" - android:title="@string/bookmark_thumbnail_view"/> + android:title="@string/bookmark_thumbnail_view" + android:icon="@drawable/ic_thumbnail_view_holo_dark" /> <item android:id="@+id/list_view" - android:title="@string/bookmark_list_view"/> + android:title="@string/bookmark_list_view" + android:icon="@drawable/ic_list_view_holo_dark" /> <item android:id="@+id/preferences_menu_id" android:title="@string/menu_preferences" + android:icon="@drawable/ic_settings_holo_dark" android:alphabeticShortcut="p" /> </menu> diff --git a/res/raw/most_visited.ktpl b/res/raw/most_visited.ktpl index 04b9eee..9a6e1b8 100644 --- a/res/raw/most_visited.ktpl +++ b/res/raw/most_visited.ktpl @@ -3,7 +3,7 @@ <html>
<head>
<title><%@ string/new_tab %></title>
-<meta name="viewport" content="width=device-width; initial-scale=1.0;" />
+<meta name="viewport" content="width=device-width; initial-scale=1.0; user-scalable=0" />
<style type="text/css">
@@ -14,20 +14,19 @@ body {
text-align: center;
- margin: 16px auto;
+ margin: 0px auto;
padding: 0 8px 0 8px;
max-width: <%@ dimen/mv_max_width %>px;
}
-#most_visited h3 {
+h3 {
text-align: center;
- padding: 0;
- margin: 5px 0 5px 0px;
+ margin: 5px 0 5px 0;
}
.thumbwrap li {
display: inline-block;
- margin: 0 7px 15px 7px;
+ margin: 0 7px 12px 7px;
padding: 0;
}
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 8b5e833..0652277 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"بيانات الملء التلقائي"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"إدخال وحفظ البيانات لملء حقول نموذج الويب تلقائيًا"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"تسجيل الدخول تلقائيًا إلى Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"تسجيل الدخول إلى مواقع Google باستخدام <xliff:g id="ID_1">%s</xliff:g>"\n"تتحكم إعدادات الخصوصية والأمان في تسجيل الدخول التلقائي إلى Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"تسجل الدخول التلقائي متاح."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"تسجيل الدخول"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"أخفق تسجيل الدخول."</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index a5fd83a..7f01739 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Данни за автоматичното попълване"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Въведете и запазете данни за автоматично попълване на полетата в уеб формуляри"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Автоматичен вход в Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Влизате в сайтове на Google посредством <xliff:g id="ID_1">%s</xliff:g>"\n"Настройките ви за поверителност и сигурност контролират автоматичния вход в Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Автоматичният вход е налице."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Вход"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Влизането не бе успешно."</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 5f4ae04..10ec706 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dades d\'emplenament automàtic"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introdueix i desa les dades per emplenar automàticament els camps del formulari web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Inici sessió automàtic a Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"S\'està iniciant la sessió a Llocs web de Google amb <xliff:g id="ID_1">%s</xliff:g>"\n"La configuració de privadesa i de seguretat controla l\'inici de sessió automàtic de Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Inici de sessió automàtic disponible."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Inici sessió"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Error en iniciar sessió."</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a86f58d..a70165e 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatické vyplnění údajů"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Zadat a uložit údaje pro automatické vyplnění polí webových formulářů"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatické přihlášení do Googlu"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Přihlašování na stránky Google pomocí uživatelského jména <xliff:g id="ID_1">%s</xliff:g>"\n"Automatické přihlášení Google se řídí vaším nastavením ochrany osobních údajů a zabezpečení"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatické přihlašování je k dispozici."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Přihlášení"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Přihlášení selhalo."</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 766bd97..a21ecaa 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Data i AutoFyld"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Indtast og gem data til autoudfyldning af felter i webformularer"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatisk Google-login"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Logger ind på Googles websteder ved hjælp af <xliff:g id="ID_1">%s</xliff:g>"\n"Dine indstillinger for sikkerhed og beskyttelse af personlige oplysninger kontrollerer automatisk Google-login"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisk login er tilgængelig."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Log ind"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Login mislykkedes."</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index af0655b..d491435 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Daten automatisch ausfüllen"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Eingabe und Speichern von Daten für automatisch auszufüllende Webformularfelder"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatische Google-Anmeldung"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Sie werden mit <xliff:g id="ID_1">%s</xliff:g> in Google-Websites angemeldet."\n"Die automatische Google-Anmeldung wird durch Ihre Einstellungen für Datenschutz und Sicherheit gesteuert."</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatische Anmeldung ist verfügbar."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Anmelden"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Anmeldung fehlgeschlagen"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index bddb6bf..21d37ae 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Αυτόματη συμπλήρωση δεδομένων"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Καταχώριση και αποθήκευση δεδομένων για πεδία φόρμας ιστού αυτόματης συμπλήρωσης"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Αυτόματη σύνδεση στο Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Σύνδεση σε Ιστότοπους Google χρησιμοποιώντας το αναγνωριστικό <xliff:g id="ID_1">%s</xliff:g>"\n"Οι ρυθμίσεις απορρήτου και ασφάλειας ελέγχουν την αυτόματη σύνδεση στο Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Διαθέσιμη αυτόματη σύνδεση."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Σύνδεση"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Η σύνδεση απέτυχε."</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index e3120df..7a133ab 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Auto-fill data"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Enter and save data for auto-filling web form fields"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatic Google sign-in"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Signing into Google sites using <xliff:g id="ID_1">%s</xliff:g>"\n"Your privacy & security settings controls automatic Google sign-in"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatic sign-in is available."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Login"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Login failed."</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index f4abc2c..b5ed5bf 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Datos de llenado automático"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ingresa y guarda datos para llenar campos de formularios web automáticamente."</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Acceso automático a Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Acceso a sitios de Google usando <xliff:g id="ID_1">%s</xliff:g>"\n"tu acceso automático en Google de control de configuraciones de privacidad & seguridad"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Acceso automático disponible"</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Acceder"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Falló el acceso."</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 4e7ad01..a80be49 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Datos de Autocompletar"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introducir y guardar datos de campos de cumplimentación automática de formularios web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Acceso automático a Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Accediendo a Google Sites mediante el <xliff:g id="ID_1">%s</xliff:g>"\n"acceso automático de Google de control de los ajustes de seguridad y de privacidad"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"El acceso automático está disponible."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Acceder"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Error al acceder"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 9d768de..561cabf 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"تکمیل خودکار داده ها"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"جهت تکمیل خودکار قسمت های فرم وب، داده ها را وارد و ذخیره کنید"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"ورود به سیستم خودکار Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"ورود به سیستم سایت های Google با استفاده از <xliff:g id="ID_1">%s</xliff:g>"\n"تنظیمات حریم خصوصی و امنیت، ورود به سیستم خودکار Google را کنترل می کند"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"ورود به سیستم خودکار امکان پذیر است."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"ورود به سیستم"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"ورود به سیستم انجام نشد."</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index acc1c78..bf414e7 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Tietojen automaattinen täyttö"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Tallenna tietoja verkkolomakkeiden automaattista täyttöä varten"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automaattinen Google-sisäänkirjaus"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Kirjaudutaan sisään Googlen sivustoihin käyttäen tiliä <xliff:g id="ID_1">%s</xliff:g>"\n"Automaattista Google-sisäänkirjautumista säätelevät tietosuoja- ja turvallisuusasetuksesi"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automaattinen kirjautuminen käytettävissä."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Kirjaudu"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Kirjautuminen epäonnistui."</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index c7befa7..9047b60 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -154,7 +154,7 @@ <string name="pref_use_current" msgid="1778622474040406672">"Page en cours"</string> <string name="pref_use_blank" msgid="8503238592551111169">"Page vierge"</string> <string name="pref_use_default" msgid="192587563274735878">"Page par défaut"</string> - <string name="pref_content_autofit" msgid="8260474534053660809">"Redimensionner"</string> + <string name="pref_content_autofit" msgid="8260474534053660809">"Ajustement auto des pages"</string> <string name="pref_content_autofit_summary" msgid="4587831659894879986">"Configurer les pages Web pour qu\'elles s\'ajustent à l\'écran"</string> <string name="pref_general_title" msgid="1946872771219249323">"Général"</string> <string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronisation"</string> @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Données de la saisie automatique"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Saisir et enregistrer des données à des fins de saisie automatique dans les champs de formulaires Web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Connexion automatique à Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Connexion aux sites Google avec <xliff:g id="ID_1">%s</xliff:g>"\n"La connexion automatique à Google dépend de vos paramètres de confidentialité et de sécurité."</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"La connexion automatique est disponible."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Connexion"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Échec de la connexion"</string> @@ -349,7 +350,7 @@ <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Mémoriser les préférences"</string> <string name="geolocation_permissions_prompt_toast_allowed" msgid="987286072035125498">"Ce site peut afficher votre position. Modifiez cette option dans Paramètres -> Paramètres du site Web."</string> <string name="geolocation_permissions_prompt_toast_disallowed" msgid="7695100950212692515">"Ce site ne peut afficher votre position. Modifiez cette option dans Paramètres -> Paramètres du site Web."</string> - <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Accès données localis."</string> + <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Supprimer l\'accès"</string> <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"Ce site a actuellement accès à vos données de localisation."</string> <string name="geolocation_settings_page_summary_not_allowed" msgid="4589649082203102544">"Ce site n\'a actuellement pas accès à vos données de localisation."</string> <string name="geolocation_settings_page_dialog_title" msgid="1549842043381347668">"Supprimer l\'accès"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 08b03d6..b5de759 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatsko popunjavanje podataka"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Unošenje i spremanje podataka za automatsko popunjavanje polja web-obrasca"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatska prijava na Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Prijavljivanjem u Google Web-lokacije pomoću postavki <xliff:g id="ID_1">%s</xliff:g>"\n"Vaša privatnost i sigurnost nadzire se automatska prijava na Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Dostupna je automatska prijava."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prijava"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Prijava nije uspjela."</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index b5bd149..47c4585 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Adatok automatikus kitöltése"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Adatok beírása és mentése az internetes űrlapok mezőinek automatikus kitöltéséhez"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatikus Google-bejelentkezés"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Bejelentkezés a Google webhelyeire a következő használatával: <xliff:g id="ID_1">%s</xliff:g>"\n"Az automatikus Google-bejelentkezést adatvédelmi és biztonsági beállításai szabályozzák"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Az automatikus bejelentkezés elérhető."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Bejelentk."</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Sikertelen bejelentkezés."</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 29954fa..ea27e30 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Isi-otomatis data"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Masukkan dan simpan data untuk mengisi-otomatis bidang formulir web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Masuk ke Google secara otomatis"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Memasuki situs Google dengan <xliff:g id="ID_1">%s</xliff:g>"\n"Setelan privasi & keamanan Anda mengontrol aktivitas masuk otomatis ke Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Fitur masuk otomatis tersedia."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Masuk"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Upaya masuk gagal."</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 7a8a6a1..3ed8b1f 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dati per compilazione automatica"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Inserisci e salva dati per la compilazione automatica dei campi dei moduli web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Accesso Google automatico"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Accesso ai siti di Google con <xliff:g id="ID_1">%s</xliff:g>"\n"L\'accesso automatico a Google è controllato dalle tue impostazioni di privacy e sicurezza"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Accesso automatico disponibile."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Accedi"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Accesso non riuscito."</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 85992df..b88d099 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"נתונים של \'מילוי אוטומטי\'"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"הזן נתונים ושמור אותם למילוי אוטומטי של שדות בטופס אינטרנט"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"כניסה אוטומטית ל-Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"כניסה ל-Google Sites באמצעות <xliff:g id="ID_1">%s</xliff:g>"\n" הגדרות הפרטיות והאבטחה שלך שולטות בכניסה האוטומטית ל-Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"הכניסה האוטומטית זמינה."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"התחבר"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"ההתחברות נכשלה."</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 2620591..1322606 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"自動入力データ"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"ウェブフォームフィールドに自動入力するデータを入力、保存する"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Googleへの自動ログイン"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"<xliff:g id="ID_1">%s</xliff:g>を使用してGoogleサイトにログインしています"\n"Googleへの自動ログインは、プライバシーとセキュリティの設定で管理されます"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"自動ログインを利用できます。"</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"ログイン"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"ログインに失敗しました。"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 0427279..37a2aa2 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"데이터 자동 입력"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"자동 입력 웹 양식 필드에 대한 데이터 입력 및 저장"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"자동 Google 로그인"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"<xliff:g id="ID_1">%s</xliff:g>"\n"개인정보 및 보안 설정 컨트롤 자동 Google 로그인을 사용하여 Google 사이트에 로그인"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"자동 로그인을 사용할 수 있습니다."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"로그인"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"로그인하지 못했습니다."</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index af1e434..665cfa7 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatinis duomenų pildymas"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Įveskite duomenis ir išsaugokite juos automatinio pildymo formos žiniatinklyje laukuose"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Autom. prisijung. prie „Google“"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Prisijungiama prie „Google“ svetainių naudojant <xliff:g id="ID_1">%s</xliff:g>"\n"Automatinis prisijungimas prie „Google“ valdomas pagal „Privatumo ir saugos“ nustatymus"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Galimas automatinis prisijungimas."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prisijung."</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Nepavyko prisijungti."</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index f880b81..f2d3011 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Datu automātiskā ievadīšana"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ievadiet un saglabājiet datus tīmekļa veidlapu lauku automātiskai aizpildīšanai."</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Autom. pierakst. vietnē Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Notiek pierakstīšanās Google vietnēs, izmantojot <xliff:g id="ID_1">%s</xliff:g>"\n"jūsu konfidencialitātes un drošības iestatījumu vadīklu Automātiska Google pierakstīšanās."</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Ir pieejama automātiskā pierakstīšanās."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Pieteikties"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Neizdevās pieteikties."</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 503648a..6478a8f 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Fyll inn data automatisk"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Skriv inn og lagre data for automatisk utfylling av nettskjemafelter"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatisk Google-pålogging"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Pålogging for Google-nettsteder med <xliff:g id="ID_1">%s</xliff:g>"\n"Innstillingene for personvern og sikkerhet styrer automatisk Google-pålogging"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisk pålogging er tilgjengelig."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Logg på"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Pålogging mislyktes."</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index f1486ab..93ef7f3 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Gegevens automatisch aanvullen"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Gegevens invoeren en opslaan voor automatisch invullen van velden in webformulieren"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatische Google-aanmelding"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Aanmelden bij Google-sites met <xliff:g id="ID_1">%s</xliff:g>"\n"Uw instellingen voor privacy en beveiliging zijn van toepassing op uw automatische Google-aanmelding"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisch aanmelden is beschikbaar."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Aanmelden"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Aanmelden mislukt."</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 2df666f..cf11557 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dane autouzupełniania"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Wprowadzaj i zapisuj dane na potrzeby autouzupełniania pól formularzy internetowych"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatyczne logowanie do Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Logowanie do witryn Google przy użyciu identyfikatora <xliff:g id="ID_1">%s</xliff:g>"\n"Ustawienia automatycznego logowania do Google znajdują się w sekcji Prywatność i bezpieczeństwo."</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatyczne logowanie jest dostępne."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Zaloguj"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Niepowodzenie logowania."</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 5c911a0..1a651d2 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Preencher dados automaticamente"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introduzir e guardar dados de campos de formulários Web de preenchimento automático"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Início sessão automático Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Iniciar sessão em sites Google utilizando <xliff:g id="ID_1">%s</xliff:g>"\n"o início de sessão automático do Google do controlo de definições de Privacidade e Segurança"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Início sessão automático disponível."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"In. sessão"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Falha ao iniciar sessão."</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 694cce9..353099d 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dados de preenchim. autom."</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Inserir e salvar dados para preencher automaticamente os campos dos formulários da web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Login automático do Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Fazendo login nos sites do Google com <xliff:g id="ID_1">%s</xliff:g>"\n"Suas configurações de Privacidade e segurança controlam o login automático no Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"O login automático está disponível."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Fazer login"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Falha de login."</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index bc23cc8..5cabaa0 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -208,7 +208,7 @@ <skip /> <!-- no translation found for pref_autologin_title (2362827272595366379) --> <skip /> - <!-- no translation found for pref_autologin_progress (4975430912641403743) --> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> <skip /> <!-- no translation found for autologin_bar_text (8013977161879448141) --> <skip /> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 8c3b329..a2c2e2f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Date conectare automată"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introduceţi şi salvaţi date pentru completarea automată a câmpurilor din formularele web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Conectare automată la Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Se face conectarea la site-urile Google utilizând <xliff:g id="ID_1">%s</xliff:g>"\n"Setările dvs. de confidenţialitate şi securitate controlează conectarea automată la Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Este disponibilă conectarea automată."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Conectare"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Conectare eşuată."</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index ad70617..1960517 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Автозаполнение"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Указание и сохранение данных для автозаполнения полей"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Автоматический вход в Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Автоматический вход на сайты Google с использованием <xliff:g id="ID_1">%s</xliff:g>"\n"настроек \"Конфиденциальность и безопасность\" системы..."</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Доступен автоматический вход."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Войти"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Войти не удалось."</string> @@ -247,7 +248,7 @@ <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Масштаб по умолчанию"</string> <string name="pref_content_load_page" msgid="2219810141690955452">"Обзор страниц"</string> <string name="pref_content_load_page_summary" msgid="8792093504054149369">"Открывать страницы в мелком маштабе для ознакомления"</string> - <string name="pref_extras_title" msgid="7075456173747370647">"Расширенный"</string> + <string name="pref_extras_title" msgid="7075456173747370647">"Дополнительные функции"</string> <string name="pref_extras_website_settings" msgid="67866640052455549">"Настройки веб-сайта"</string> <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Дополнительные настройки для отдельных сайтов"</string> <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Сброс настроек"</string> @@ -272,7 +273,7 @@ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Панель инструментов"</string> <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Чтобы открыть панель инструментов, скрыв адресную строку и панель приложений, проведите пальцем в правом или левом углу экрана"</string> <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Стартовая страница: самые посещаемые"</string> - <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Отображение на домашней странице наиболее посещаемых веб-сайтов."</string> + <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Отображение часто посещаемых веб-сайтов на стартовой странице."</string> <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Живой поиск"</string> <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Живой поиск Google отображает результаты поиска при наборе запроса (может привести к увеличению объема передачи данных)."</string> <string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблема с подключением"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index dc9778f..11981ef 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatické dopĺňanie údajov"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Zadajte a uložte údaje pre automatické dopĺňanie polí webových formulárov"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatické prihlasovanie Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Prihlásenie na stránky služby Google pomocou <xliff:g id="ID_1">%s</xliff:g>"\n"Automatického prihlásenia Google s vašimi nastaveniami ochrany osobných údajov a zabezpečenia"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatické prihlásenie je k dispozícii."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prihlásiť"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Prihlásenie zlyhalo."</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 7213575..9c181dc 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Samodejno izpolnjevanje podatkov"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Vnesite in shranite podatke za samodejno izpolnjevanje polj v spletnih obrazcih"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Samodejna prijava v Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Samodejna prijava v Googlova spletna mesta z <xliff:g id="ID_1">%s</xliff:g>"\n"Samodejna prijava v Google je določena v nastavitvah zasebnosti in varnosti"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Na voljo je samodejna prijava."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prijava"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Prijava ni uspela."</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 34f67dc..bc82ce1 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Аутоматски попуни податке"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Унесите и сачувајте податке за аутоматско попуњавање поља у веб обрасцима"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Аутоматска пријава на Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Пријављивање на Google сајтове помоћу <xliff:g id="ID_1">%s</xliff:g>"\n"Подешавања приватности и безбедности контролишу аутоматско пријављивање на Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Аутоматско пријављивање је доступно."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Пријави ме"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Пријављивање није успело."</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 11b52f0..a111bec 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Fyll i data automatiskt"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ange och spara data för automatisk ifyllning av webbformulärfält"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Automatiskt inloggning på Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Loggar in på Googles webbplatser med <xliff:g id="ID_1">%s</xliff:g>"\n"Automatisk inloggning på Google styrs med inställningarna i Sekretess och säkerhet"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisk inloggning är tillgänglig."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Logga in"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Misslyckad inloggning."</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index eb7e3f0..f9e16c1 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"ป้อนข้อมูลอัตโนมัติ"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"ป้อนและบันทึกข้อมูลสำหรับการป้อนฟิลด์ของเว็บฟอร์มอัตโนมัติ"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"ลงชื่อเข้าใช้ Google อัตโนมัติ"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"กำลังลงชื่อเข้าใช้ Google Sites ด้วย <xliff:g id="ID_1">%s</xliff:g>"\n"การตั้งค่าข้อมูลส่วนบุคคลและความปลอดภัยจะควบคุมการลงชื่อเข้าใช้อัตโนมัติของ Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"การลงชื่อเข้าใช้อัตโนมัติพร้อมใช้งาน"</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"ลงชื่อเข้าใช้"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"ลงชื่อเข้าใช้ล้มเหลว"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 5b3ffcc..8fcb33e 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Data ng auto-fill"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ilagay at i-save ang data para sa mga field ng form ng web sa pag-auto-fill"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Awtomatiko pag-sign in sa Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Pag-sign in sa mga site ng Google gamit ang <xliff:g id="ID_1">%s</xliff:g>"\n"Kinokontrol ng iyong mga setting ng privacy at seguridad ang awtomatikong pag-sign-in sa Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Available ang awtomatikong pag-sign in."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Mag-login"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Nabigo ang pag-login."</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 2221edc..76921f8 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Otomatik doldurma verileri"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Web formu alanlarının otomatik olarak doldurulması için verileri girin ve kaydedin"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Otomatik Google oturumu açma"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"<xliff:g id="ID_1">%s</xliff:g> hesabı ile Google Sites hizmetinde oturum açılıyor"\n"Google\'da otomatik oturum açmanız gizlilik ve güvenlik ayarlarınız tarafından denetlenir."</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Otomatik oturum açma kullanılabilir."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Giriş yap"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Giriş yapılamadı."</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index dbd3f01..913a071 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Дані автозаповнення"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Введіть і збережіть дані для полів автоматичного заповнення веб-форм"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Автоматичний вхід у Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Вхід у Google Sites за допомогою <xliff:g id="ID_1">%s</xliff:g>"\n"Ваші налаштування конфіденційності та безпеки контролюють автоматичний вхід у Google"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Доступний автоматичний вхід."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Увійти"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Помилка входу."</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 3f1addc..3e49491 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Tự động điền dữ liệu"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Nhập và lưu dữ liệu cho các trường tự động điền biểu mẫu web"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"Tự động đăng nhập Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"Đang đăng nhập vào các trang web của Google bằng <xliff:g id="ID_1">%s</xliff:g>"\n"Cài đặt riêng tư & bảo mật kiểm soát đăng nhập Google tự động"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"Tính năng đăng nhập tự động hiện khả dụng."</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"Đăng nhập"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"Đăng nhập không thành công."</string> @@ -217,7 +218,7 @@ <string name="pref_privacy_location_title" msgid="7458378016606081067">"Vị trí"</string> <string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"Bật vị trí"</string> <string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"Cho phép trang web yêu cầu quyền truy cập vào vị trí của bạn"</string> - <string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"Xoá truy cập vị trí"</string> + <string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"Xóa truy cập vị trí"</string> <string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"Xoá truy cập vị trí cho tất cả trang web"</string> <string name="pref_privacy_clear_geolocation_access_dlg" msgid="7327063124488827244">"Xoá truy cập vị trí cho tất cả trang web"</string> <string name="pref_security_passwords_title" msgid="5734190542383756711">"Mật khẩu"</string> @@ -349,10 +350,10 @@ <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Nhớ tuỳ chọn"</string> <string name="geolocation_permissions_prompt_toast_allowed" msgid="987286072035125498">"Trang web này có thể truy cập vị trí của bạn. Thay đổi điều này trong Cài đặt -> Cài đặt trang web"</string> <string name="geolocation_permissions_prompt_toast_disallowed" msgid="7695100950212692515">"Trang web này không thể truy cập vị trí của bạn. Thay đổi điều này trong Cài đặt -> Cài đặt trang web"</string> - <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Xoá truy cập vị trí"</string> + <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Xóa truy cập vị trí"</string> <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"Trang web này hiện có thể truy cập vị trí của bạn"</string> <string name="geolocation_settings_page_summary_not_allowed" msgid="4589649082203102544">"Trang web này hiện không thể truy cập vị trí của bạn"</string> - <string name="geolocation_settings_page_dialog_title" msgid="1549842043381347668">"Xoá truy cập vị trí"</string> + <string name="geolocation_settings_page_dialog_title" msgid="1549842043381347668">"Xóa truy cập vị trí"</string> <string name="geolocation_settings_page_dialog_message" msgid="7586671987576403993">"Truy cập vị trí cho trang web này sẽ bị xoá"</string> <string name="geolocation_settings_page_dialog_ok_button" msgid="4789434178048077287">"Xoá truy cập"</string> <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Huỷ"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 93e541a..b01a048 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"自动填充数据"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"输入并保存网络表单自动填充字段的数据"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"自动登录 Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"使用 <xliff:g id="ID_1">%s</xliff:g> 登录 Google 网站"\n"Google 自动登录功能是由“隐私和安全”设置控制的"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"自动登录已可使用。"</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"登录"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"登录失败。"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 394d5b9..014b1e4 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -171,7 +171,8 @@ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"自動填入資料"</string> <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"輸入並儲存資料，以供自動填入表單欄位時使用"</string> <string name="pref_autologin_title" msgid="2362827272595366379">"自動登入 Google"</string> - <string name="pref_autologin_progress" msgid="4975430912641403743">"使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"\n"可讓您運用「隱私權與安全性」設定來控制 Google 自動登入程序"</string> + <!-- no translation found for pref_autologin_progress (8333244467048833461) --> + <skip /> <string name="autologin_bar_text" msgid="8013977161879448141">"可讓您自動登入。"</string> <string name="autologin_bar_login_text" msgid="7052816600314556734">"登入"</string> <string name="autologin_bar_error" msgid="5132514366023044839">"登入失敗。"</string> diff --git a/res/values/colors.xml b/res/values/colors.xml index 6a7c578..15a5c87 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,4 +36,5 @@ <color name="qcMenuBackground">#C0000000</color> <color name="qc_normal">#C02447B2</color> <color name="qc_selected">#D0102052</color> + <color name="tabViewTitleBackground">#D0000000</color> </resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 99eb43e..f1e7fb3 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -40,11 +40,11 @@ <dimen name="qc_item_size">48dip</dimen> <dimen name="bookmark_widget_thumb_size">32dip</dimen> <dimen name="bookmark_widget_favicon_size">26dip</dimen> - <!-- For the most visited page --> - <dimen name="mv_max_width">830dp</dimen> - <dimen name="mv_item_width">96dp</dimen> - <dimen name="mv_item_width_portrait">96dp</dimen> - <dimen name="mv_border_width">3dp</dimen> + <!-- For the most visited page (we use px as these are adjusted by the browser) --> + <dimen name="mv_max_width">830px</dimen> + <dimen name="mv_item_width">94px</dimen> + <dimen name="mv_item_width_portrait">80px</dimen> + <dimen name="mv_border_width">2px</dimen> <dimen name="tab_padding_top">12dp</dimen> <dimen name="tab_first_padding_left">12dp</dimen> <dimen name="list_favicon_padding">5dip</dimen> @@ -55,6 +55,7 @@ <dimen name="widgetVerticalSpacing">12dip</dimen> <!-- For the combined Bookmarks History view --> <dimen name="combo_paddingTop">10dip</dimen> - <dimen name="combo_paddingLeftRight">16dip</dimen> - <dimen name="combo_horizontalSpacing">8dip</dimen> + <dimen name="combo_paddingLeftRight">8dip</dimen> + <dimen name="combo_horizontalSpacing">6dip</dimen> + <dimen name="tab_view_thumbnail_height">76dip</dimen> </resources> diff --git a/res/xml-xlarge/lab_preferences.xml b/res/xml-xlarge/lab_preferences.xml new file mode 100644 index 0000000..87383b0 --- /dev/null +++ b/res/xml-xlarge/lab_preferences.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" > + + <CheckBoxPreference + android:key="enable_quick_controls" + android:defaultValue="false" + android:title="@string/pref_lab_quick_controls" + android:summary="@string/pref_lab_quick_controls_summary" /> + + <CheckBoxPreference + android:key="use_most_visited_homepage" + android:defaultValue="false" + android:title="@string/pref_lab_most_visited_homepage" + android:summary="@string/pref_lab_most_visited_homepage_summary" /> + + <CheckBoxPreference + android:key="use_instant_search" + android:defaultValue="false" + android:title="@string/pref_use_instant_search" + android:summary="@string/pref_use_instant_search_summary" /> +</PreferenceScreen> diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml index 87383b0..3a384f1 100644 --- a/res/xml/lab_preferences.xml +++ b/res/xml/lab_preferences.xml @@ -16,22 +16,9 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - - <CheckBoxPreference - android:key="enable_quick_controls" - android:defaultValue="false" - android:title="@string/pref_lab_quick_controls" - android:summary="@string/pref_lab_quick_controls_summary" /> - <CheckBoxPreference android:key="use_most_visited_homepage" android:defaultValue="false" android:title="@string/pref_lab_most_visited_homepage" android:summary="@string/pref_lab_most_visited_homepage_summary" /> - - <CheckBoxPreference - android:key="use_instant_search" - android:defaultValue="false" - android:title="@string/pref_use_instant_search" - android:summary="@string/pref_use_instant_search_summary" /> </PreferenceScreen> diff --git a/src/com/android/browser/ActiveTabsPage.java b/src/com/android/browser/ActiveTabsPage.java index 664fd68..52d943f 100644 --- a/src/com/android/browser/ActiveTabsPage.java +++ b/src/com/android/browser/ActiveTabsPage.java @@ -18,62 +18,87 @@ package com.android.browser; import android.content.Context; import android.graphics.Bitmap; -import android.os.Handler; +import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; +import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.AbsListView; import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; import android.widget.ImageView; +import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; -import android.widget.ListView; import android.widget.TextView; -public class ActiveTabsPage extends LinearLayout { +interface OnCloseTab { + void onCloseTab(int position); +} - private static final String LOGTAG = "TabPicker"; +public class ActiveTabsPage extends LinearLayout implements OnClickListener, + OnItemClickListener, OnCloseTab { - private final LayoutInflater mFactory; - private final UiController mUiController; - private final TabControl mControl; - private final TabsListAdapter mAdapter; - private final ListView mListView; + private Context mContext; + private UiController mController; + private TabControl mTabControl; + private View mNewTab, mNewIncognitoTab; + private TabAdapter mAdapter; + private AbsListView mTabsList; - public ActiveTabsPage(Context context, UiController control) { + public ActiveTabsPage(Context context, UiController controller) { super(context); - mUiController = control; - mControl = control.getTabControl(); - mFactory = LayoutInflater.from(context); - mFactory.inflate(R.layout.active_tabs, this); - mListView = (ListView) findViewById(R.id.list); - mAdapter = new TabsListAdapter(); - mListView.setAdapter(mAdapter); - mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - public void onItemClick(AdapterView<?> parent, View view, - int position, long id) { - if (mControl.canCreateNewTab()) { - position -= 2; - } - boolean needToAttach = false; - if (position == -2) { - // Create a new tab - mUiController.openTabToHomePage(); - } else if (position == -1) { - // Create a new incognito tab - mUiController.openIncognitoTab(); - } else { - // Open the corresponding tab - // If the tab is the current one, switchToTab will - // do nothing and return, so we need to make sure - // it gets attached back to its mContentView in - // removeActiveTabPage - needToAttach = !mUiController.switchToTab(position); - } - mUiController.removeActiveTabsPage(needToAttach); - } - }); + mContext = context; + mController = controller; + mTabControl = mController.getTabControl(); + setOrientation(VERTICAL); + setBackgroundResource(R.drawable.bg_browser); + LayoutInflater inflate = LayoutInflater.from(mContext); + inflate.inflate(R.layout.active_tabs, this, true); + mNewTab = findViewById(R.id.new_tab); + mNewIncognitoTab = findViewById(R.id.new_incognito_tab); + mNewTab.setOnClickListener(this); + mNewIncognitoTab.setOnClickListener(this); + int visibility = mTabControl.canCreateNewTab() ? View.VISIBLE : View.GONE; + mNewTab.setVisibility(visibility); + mNewIncognitoTab.setVisibility(visibility); + mTabsList = (AbsListView) findViewById(android.R.id.list); + mAdapter = new TabAdapter(mContext, mTabControl); + mAdapter.setOnCloseListener(this); + mTabsList.setAdapter(mAdapter); + mTabsList.setOnItemClickListener(this); + } + + @Override + public void onClick(View v) { + if (v == mNewTab) { + mController.openTabToHomePage(); + } else if (v == mNewIncognitoTab) { + mController.openIncognitoTab(); + } + mController.removeActiveTabsPage(false); + } + + @Override + public void onItemClick( + AdapterView<?> parent, View view, int position, long id) { + boolean needToAttach = !mController.switchToTab(position); + mController.removeActiveTabsPage(needToAttach); + } + + @Override + public void onCloseTab(int position) { + Tab tab = mTabControl.getTab(position); + if (tab != null) { + mController.closeTab(tab); + if (mTabControl.getTabCount() == 0) { + mController.openTabToHomePage(); + mController.removeActiveTabsPage(false); + } else { + mAdapter.notifyDataSetChanged(); + } + } } /** @@ -81,7 +106,7 @@ public class ActiveTabsPage extends LinearLayout { * the parent to be pressed without being pressed itself. This way the line * of a tab can be pressed, but the close button itself is not. */ - private static class CloseHolder extends ImageView { + public static class CloseHolder extends ImageView { public CloseHolder(Context context, AttributeSet attrs) { super(context, attrs); } @@ -96,118 +121,79 @@ public class ActiveTabsPage extends LinearLayout { } } - private class TabsListAdapter extends BaseAdapter { - private boolean mNotified = true; - private int mReturnedCount; - private Handler mHandler = new Handler(); + static class TabAdapter extends BaseAdapter implements OnClickListener { - public int getCount() { - int count = mControl.getTabCount(); - if (mControl.canCreateNewTab()) { - count += 2; - } - // XXX: This is a workaround to be more like a real adapter. Most - // adapters call notifyDataSetChanged() whenever the internal data - // has changed. Since TabControl is our internal data, we don't - // know when that changes. - // - // Keep track of the last count we returned and whether we called - // notifyDataSetChanged(). If we did not initiate a data set - // change, and the count is different, send the notify and return - // the old count. - if (!mNotified && count != mReturnedCount) { - notifyChange(); - return mReturnedCount; - } - mReturnedCount = count; - mNotified = false; - return count; - } - public Object getItem(int position) { - return null; - } - public long getItemId(int position) { - return position; - } - public int getViewTypeCount() { - return 2; + LayoutInflater mInflater; + OnCloseTab mCloseListener; + TabControl mTabControl; + + TabAdapter(Context context, TabControl tabs) { + mInflater = LayoutInflater.from(context); + mTabControl = tabs; } - public int getItemViewType(int position) { - if (mControl.canCreateNewTab()) { - position -= 2; - } - // Do not recycle the "add new tab" item. - return position < 0 ? IGNORE_ITEM_VIEW_TYPE : 1; + + void setOnCloseListener(OnCloseTab listener) { + mCloseListener = listener; } - public View getView(int position, View convertView, ViewGroup parent) { - final int tabCount = mControl.getTabCount(); - if (mControl.canCreateNewTab()) { - position -= 2; + + @Override + public View getView(int position, View view, ViewGroup parent) { + if (view == null) { + view = mInflater.inflate(R.layout.tab_view, parent, false); } + ImageView favicon = (ImageView) view.findViewById(R.id.favicon); + ImageView thumbnail = (ImageView) view.findViewById(R.id.thumb); + TextView title = (TextView) view.findViewById(R.id.label); + Tab tab = getItem(position); - if (convertView == null) { - if (position == -2) { - convertView = mFactory.inflate(R.layout.tab_view_add_tab, null); - } else if (position == -1) { - convertView = mFactory.inflate(R.layout.tab_view_add_incognito_tab, null); + String label = tab.getTitle(); + if (TextUtils.isEmpty(label)) { + label = tab.getUrl(); + } + title.setText(label); + Bitmap thumbnailBitmap = tab.getScreenshot(); + if (thumbnailBitmap == null) { + thumbnail.setImageResource(R.drawable.browser_thumbnail); + } else { + thumbnail.setImageBitmap(thumbnailBitmap); + } + Bitmap faviconBitmap = tab.getFavicon(); + if (tab.isPrivateBrowsingEnabled()) { + favicon.setImageResource(R.drawable.ic_incognito_holo_dark); + } else { + if (faviconBitmap == null) { + favicon.setImageResource(R.drawable.app_web_browser_sm); } else { - convertView = mFactory.inflate(R.layout.tab_view, null); + favicon.setImageBitmap(faviconBitmap); } } + View close = view.findViewById(R.id.close); + close.setTag(position); + close.setOnClickListener(this); + return view; + } - if (position >= 0) { - TextView title = - (TextView) convertView.findViewById(R.id.title); - TextView url = (TextView) convertView.findViewById(R.id.url); - ImageView favicon = - (ImageView) convertView.findViewById(R.id.favicon); - View close = convertView.findViewById(R.id.close); - Tab tab = mControl.getTab(position); - if (tab.getWebView() == null) { - // This means that populatePickerData will have to use the - // saved state. - Log.w(LOGTAG, "Tab " + position + " has a null WebView and " - + (tab.getSavedState() == null ? "null" : "non-null") - + " saved state "); - } - if (tab.getTitle() == null || tab.getTitle().length() == 0) { - Log.w(LOGTAG, "Tab " + position + " has no title. " - + "Check above in the Logs to see whether it has a " - + "null WebView or null WebHistoryItem"); - } - title.setText(tab.getTitle()); - url.setText(tab.getUrl()); - Bitmap icon = tab.getFavicon(); - if (icon != null) { - favicon.setImageBitmap(icon); - } else { - favicon.setImageResource(R.drawable.app_web_browser_sm); - } - final int closePosition = position; - close.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - mUiController.closeTab( - mControl.getTab(closePosition)); - if (tabCount == 1) { - mUiController.openTabToHomePage(); - mUiController.removeActiveTabsPage(false); - } else { - mNotified = true; - notifyDataSetChanged(); - } - } - }); + @Override + public void onClick(View v) { + int position = (Integer) v.getTag(); + if (mCloseListener != null) { + mCloseListener.onCloseTab(position); } - return convertView; } - void notifyChange() { - mHandler.post(new Runnable() { - public void run() { - mNotified = true; - notifyDataSetChanged(); - } - }); + @Override + public int getCount() { + return mTabControl.getTabCount(); + } + + @Override + public Tab getItem(int position) { + return mTabControl.getTab(position); + } + + @Override + public long getItemId(int position) { + return position; } } } diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 71346ae..22de40d 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -23,6 +23,7 @@ import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.animation.ObjectAnimator; import android.app.Activity; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Bitmap; @@ -122,6 +123,20 @@ public abstract class BaseUi implements UI, WebViewFactory { mTitleShowing = false; } + @Override + public WebView createWebView(boolean privateBrowsing) { + // Create a new WebView + BrowserWebView w = new BrowserWebView(mActivity, null, + android.R.attr.webViewStyle, privateBrowsing); + initWebViewSettings(w); + return w; + } + + @Override + public WebView createSubWebView(boolean privateBrowsing) { + return createWebView(privateBrowsing); + } + /** * common webview initialization * @param w the webview to initialize @@ -132,6 +147,10 @@ public abstract class BaseUi implements UI, WebViewFactory { w.setMapTrackballToArrowKeys(false); // use trackball directly // Enable the built-in zoom w.getSettings().setBuiltInZoomControls(true); + boolean supportsMultiTouch = mActivity.getPackageManager() + .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH); + w.getSettings().setDisplayZoomControls(!supportsMultiTouch); + w.setExpandedTileBounds(true); // smoother scrolling // Add this WebView to the settings observer list and update the // settings @@ -608,11 +627,6 @@ public abstract class BaseUi implements UI, WebViewFactory { @Override public void onActionModeFinished(boolean inLoad) { - if (inLoad) { - // the titlebar was removed when the CAB was shown - // if the page is loading, show it again - showTitleBar(); - } } // active tabs page diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index 9e71077..201079c 100644 --- a/src/com/android/browser/BrowserBookmarksAdapter.java +++ b/src/com/android/browser/BrowserBookmarksAdapter.java @@ -20,7 +20,6 @@ import android.content.Context; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -31,7 +30,6 @@ import android.widget.TextView; class BrowserBookmarksAdapter extends CursorAdapter { LayoutInflater mInflater; int mCurrentView; - Drawable mFaviconBackground; /** * Create a new BrowserBookmarksAdapter. @@ -42,8 +40,6 @@ class BrowserBookmarksAdapter extends CursorAdapter { super(context, null, 0); mInflater = LayoutInflater.from(context); selectView(defaultView); - float density = context.getResources().getDisplayMetrics().density; - mFaviconBackground = BookmarkUtils.createListFaviconBackground(context); } @Override @@ -101,9 +97,7 @@ class BrowserBookmarksAdapter extends CursorAdapter { } else { favicon.setImageBitmap(faviconBitmap); } - //favicon.setBackgroundResource(R.drawable.bookmark_list_favicon_bg); - // TODO: Switch to above instead of below once b/3353813 is fixed - favicon.setBackgroundDrawable(mFaviconBackground); + favicon.setBackgroundResource(R.drawable.bookmark_list_favicon_bg); } } diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index de28d0d..88b8979 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -331,10 +331,15 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte public void onCreate(Bundle icicle) { super.onCreate(icicle); - setHasOptionsMenu(true); + SharedPreferences prefs = PreferenceManager + .getDefaultSharedPreferences(getActivity()); + prefs.registerOnSharedPreferenceChangeListener(this); + mCurrentView = prefs.getInt(PREF_SELECTED_VIEW, getDefaultView()); Bundle args = getArguments(); mDisableNewWindow = args == null ? false : args.getBoolean(EXTRA_DISABLE_WINDOW, false); + + setHasOptionsMenu(true); } @Override @@ -372,11 +377,6 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte } // Start the loaders LoaderManager lm = getLoaderManager(); - SharedPreferences prefs = PreferenceManager - .getDefaultSharedPreferences(getActivity()); - prefs.registerOnSharedPreferenceChangeListener(this); - mCurrentView = - prefs.getInt(PREF_SELECTED_VIEW, getDefaultView()); mAdapter = new BrowserBookmarksAdapter(getActivity(), mCurrentView); lm.restartLoader(LOADER_BOOKMARKS, null, this); diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 44f358d..2dcda68 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -59,6 +59,9 @@ import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; +import android.widget.ExpandableListView; +import android.widget.ExpandableListView.ExpandableListContextMenuInfo; +import android.widget.ExpandableListView.OnChildClickListener; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; @@ -68,7 +71,7 @@ import android.widget.Toast; * days of viewing. */ public class BrowserHistoryPage extends Fragment - implements LoaderCallbacks<Cursor> { + implements LoaderCallbacks<Cursor>, OnChildClickListener { static final int LOADER_HISTORY = 1; static final int LOADER_MOST_VISITED = 2; @@ -82,6 +85,7 @@ public class BrowserHistoryPage extends Fragment ListView mGroupList, mChildList; private ViewGroup mPrefsContainer; private FragmentBreadCrumbs mFragmentBreadCrumbs; + private ExpandableListView mHistoryList; // Implementation of WebIconDatabase.IconListener class IconReceiver implements IconListener { @@ -187,7 +191,7 @@ public class BrowserHistoryPage extends Fragment switch (loader.getId()) { case LOADER_HISTORY: { mAdapter.changeCursor(data); - if (!mAdapter.isEmpty() + if (!mAdapter.isEmpty() && mGroupList != null && mGroupList.getCheckedItemPosition() == ListView.INVALID_POSITION) { selectGroup(0); } @@ -229,7 +233,31 @@ public class BrowserHistoryPage extends Fragment public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mRoot = inflater.inflate(R.layout.history, container, false); + mAdapter = new HistoryAdapter(getActivity()); ViewStub stub = (ViewStub) mRoot.findViewById(R.id.pref_stub); + if (stub != null) { + inflateTwoPane(stub); + } else { + inflateSinglePane(); + } + + // Start the loaders + getLoaderManager().restartLoader(LOADER_HISTORY, null, this); + getLoaderManager().restartLoader(LOADER_MOST_VISITED, null, this); + + // Register to receive icons in case they haven't all been loaded. + CombinedBookmarkHistoryView.getIconListenerSet().addListener(mIconReceiver); + return mRoot; + } + + private void inflateSinglePane() { + mHistoryList = (ExpandableListView) mRoot.findViewById(R.id.history); + mHistoryList.setAdapter(mAdapter); + mHistoryList.setOnChildClickListener(this); + registerForContextMenu(mHistoryList); + } + + private void inflateTwoPane(ViewStub stub) { stub.setLayoutResource(com.android.internal.R.layout.preference_list_content); stub.inflate(); mGroupList = (ListView) mRoot.findViewById(android.R.id.list); @@ -238,7 +266,6 @@ public class BrowserHistoryPage extends Fragment mFragmentBreadCrumbs.setMaxVisible(1); mFragmentBreadCrumbs.setActivity(getActivity()); mPrefsContainer.setVisibility(View.VISIBLE); - mAdapter = new HistoryAdapter(getActivity()); mGroupList.setAdapter(new HistoryGroupWrapper(mAdapter)); mGroupList.setOnItemClickListener(mGroupItemClickListener); mGroupList.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE); @@ -249,14 +276,6 @@ public class BrowserHistoryPage extends Fragment registerForContextMenu(mChildList); ViewGroup prefs = (ViewGroup) mRoot.findViewById(com.android.internal.R.id.prefs); prefs.addView(mChildList); - - // Start the loaders - getLoaderManager().restartLoader(LOADER_HISTORY, null, this); - getLoaderManager().restartLoader(LOADER_MOST_VISITED, null, this); - - // Register to receive icons in case they haven't all been loaded. - CombinedBookmarkHistoryView.getIconListenerSet().addListener(mIconReceiver); - return mRoot; } private OnItemClickListener mGroupItemClickListener = new OnItemClickListener() { @@ -279,6 +298,13 @@ public class BrowserHistoryPage extends Fragment }; @Override + public boolean onChildClick(ExpandableListView parent, View view, + int groupPosition, int childPosition, long id) { + mCallbacks.onUrlSelected(((HistoryItem) view).getUrl(), false); + return true; + } + + @Override public void onDestroy() { super.onDestroy(); CombinedBookmarkHistoryView.getIconListenerSet().removeListener(mIconReceiver); @@ -341,17 +367,30 @@ public class BrowserHistoryPage extends Fragment } } + View getTargetView(ContextMenuInfo menuInfo) { + if (menuInfo instanceof AdapterContextMenuInfo) { + return ((AdapterContextMenuInfo) menuInfo).targetView; + } + if (menuInfo instanceof ExpandableListContextMenuInfo) { + return ((ExpandableListContextMenuInfo) menuInfo).targetView; + } + return null; + } + @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - AdapterContextMenuInfo i = (AdapterContextMenuInfo) menuInfo; + + View targetView = getTargetView(menuInfo); + if (!(targetView instanceof HistoryItem)) { + return; + } + HistoryItem historyItem = (HistoryItem) targetView; // Inflate the menu Activity parent = getActivity(); MenuInflater inflater = parent.getMenuInflater(); inflater.inflate(R.menu.historycontext, menu); - HistoryItem historyItem = (HistoryItem) i.targetView; - // Setup the header if (mContextHeader == null) { mContextHeader = new HistoryItem(parent, false); @@ -382,12 +421,11 @@ public class BrowserHistoryPage extends Fragment @Override public boolean onContextItemSelected(MenuItem item) { - AdapterContextMenuInfo i = - (AdapterContextMenuInfo) item.getMenuInfo(); - if (i == null) { + ContextMenuInfo menuInfo = item.getMenuInfo(); + if (menuInfo == null) { return false; } - HistoryItem historyItem = (HistoryItem) i.targetView; + HistoryItem historyItem = (HistoryItem) getTargetView(menuInfo); String url = historyItem.getUrl(); String title = historyItem.getName(); Activity activity = getActivity(); diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 357d1e9..9dc3c5f 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -193,7 +193,7 @@ public class BrowserSettings extends Observable implements OnSharedPreferenceCha public static final Uri RLZ_PROVIDER_URI = Uri.parse("content://" + RLZ_PROVIDER + "/"); // Set to true to enable some of the about:debug options - public static final boolean DEV_BUILD = false; + public static final boolean DEV_BUILD = true; private Controller mController; diff --git a/src/com/android/browser/ScrollWebView.java b/src/com/android/browser/BrowserWebView.java index 8c89e51..6111aa6 100644 --- a/src/com/android/browser/ScrollWebView.java +++ b/src/com/android/browser/BrowserWebView.java @@ -17,7 +17,6 @@ package com.android.browser; import android.content.Context; -import android.graphics.Bitmap; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -28,14 +27,13 @@ import java.util.Map; /** * Manage WebView scroll events */ -public class ScrollWebView extends WebView implements Runnable { +public class BrowserWebView extends WebView implements Runnable { private ScrollListener mScrollListener; private boolean mIsCancelled; private boolean mBackgroundRemoved = false; private boolean mUserInitiated = false; private TitleBarBase mTitleBar; - private Bitmap mBitmap; /** * @param context @@ -43,7 +41,7 @@ public class ScrollWebView extends WebView implements Runnable { * @param defStyle * @param javascriptInterfaces */ - public ScrollWebView(Context context, AttributeSet attrs, int defStyle, + public BrowserWebView(Context context, AttributeSet attrs, int defStyle, Map<String, Object> javascriptInterfaces, boolean privateBrowsing) { super(context, attrs, defStyle, javascriptInterfaces, privateBrowsing); } @@ -53,7 +51,7 @@ public class ScrollWebView extends WebView implements Runnable { * @param attrs * @param defStyle */ - public ScrollWebView( + public BrowserWebView( Context context, AttributeSet attrs, int defStyle, boolean privateBrowsing) { super(context, attrs, defStyle, privateBrowsing); } @@ -62,14 +60,14 @@ public class ScrollWebView extends WebView implements Runnable { * @param context * @param attrs */ - public ScrollWebView(Context context, AttributeSet attrs) { + public BrowserWebView(Context context, AttributeSet attrs) { super(context, attrs); } /** * @param context */ - public ScrollWebView(Context context) { + public BrowserWebView(Context context) { super(context); } diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index a028882..efc58b1 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1064,6 +1064,12 @@ public class Controller mUi.revertVoiceTitleBar(tab); } + public boolean supportsVoiceSearch() { + SearchEngine searchEngine = BrowserSettings.getInstance() + .getSearchEngine(); + return (searchEngine != null && searchEngine.supportsVoiceSearch()); + } + public void showCustomView(Tab tab, View view, WebChromeClient.CustomViewCallback callback) { if (tab.inForeground()) { @@ -1774,7 +1780,6 @@ public class Controller // title bar once again. mExtendedMenuOpen = false; mUi.onExtendedMenuClosed(mInLoad); - mUi.onOptionsMenuOpened(); } } } else { diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index f1939e4..9c3c912 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -18,9 +18,12 @@ package com.android.browser; import android.app.Activity; import android.content.Context; +import android.graphics.Bitmap; import android.graphics.PixelFormat; +import android.os.Handler; import android.util.Log; import android.view.ActionMode; +import android.view.Display; import android.view.Gravity; import android.view.KeyEvent; import android.view.Menu; @@ -62,23 +65,6 @@ public class PhoneUi extends BaseUi { mActivity.getActionBar().hide(); } - // webview factory - - @Override - public WebView createWebView(boolean privateBrowsing) { - // Create a new WebView - WebView w = new WebView(mActivity, null, - android.R.attr.webViewStyle, privateBrowsing); - initWebViewSettings(w); - return w; - } - - @Override - public WebView createSubWebView(boolean privateBrowsing) { - WebView web = createWebView(privateBrowsing); - return web; - } - // lifecycle @Override @@ -133,6 +119,7 @@ public class PhoneUi extends BaseUi { @Override public void setActiveTab(Tab tab) { + captureTab(mActiveTab); super.setActiveTab(tab); WebView view = tab.getWebView(); // TabControl.setCurrentTab has been called before this, @@ -150,6 +137,18 @@ public class PhoneUi extends BaseUi { tab.getTopWindow().requestFocus(); } + public void captureTab(final Tab tab) { + if (tab == null) return; + if (tab.getWebView() == null) return; + + Display display = mActivity.getWindowManager().getDefaultDisplay(); + float height = mActivity.getResources() + .getDimension(R.dimen.tab_view_thumbnail_height); + Bitmap sshot = Controller.createScreenshot(tab, + display.getWidth(), (int) height); + tab.setScreenshot(sshot); + } + @Override protected void showTitleBar() { if (canShowTitleBar()) { @@ -175,6 +174,7 @@ public class PhoneUi extends BaseUi { @Override public void showActiveTabsPage() { + captureTab(mActiveTab); mActiveTabsPage = new ActiveTabsPage(mActivity, mUiController); mTitleBar.setVisibility(View.GONE); hideTitleBar(); @@ -255,6 +255,17 @@ public class PhoneUi extends BaseUi { } @Override + public void onActionModeFinished(boolean inLoad) { + // TODO: Remove once b/4136071 is fixed + new Handler().post(new Runnable() { + @Override + public void run() { + mActivity.getActionBar().hide(); + } + }); + } + + @Override public boolean dispatchKey(int code, KeyEvent event) { return false; } diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index 1d17cb3..c97fc71 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -16,7 +16,7 @@ package com.android.browser; -import com.android.browser.ScrollWebView.ScrollListener; +import com.android.browser.BrowserWebView.ScrollListener; import android.animation.Animator; import android.animation.Animator.AnimatorListener; diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index 686416c..361e94c 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -17,12 +17,8 @@ package com.android.browser; import android.app.Activity; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.speech.RecognizerIntent; import android.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; @@ -50,8 +46,8 @@ public class TitleBar extends TitleBarBase implements OnFocusChangeListener, private Drawable mBookmarkDrawable; private Drawable mVoiceDrawable; private boolean mInLoad; - private Intent mVoiceSearchIntent; private ImageSpan mArcsSpan; + private View mContainer; public TitleBar(Activity activity, UiController controller, PhoneUi ui) { super(activity, controller, ui); @@ -59,6 +55,7 @@ public class TitleBar extends TitleBarBase implements OnFocusChangeListener, factory.inflate(R.layout.title_bar, this); mActivity = activity; + mContainer = findViewById(R.id.taburlbar); mUrlInput = (UrlInputView) findViewById(R.id.url_input); mUrlInput.setCompoundDrawablePadding(5); mUrlInput.setContainer(this); @@ -76,31 +73,21 @@ public class TitleBar extends TitleBarBase implements OnFocusChangeListener, mHorizontalProgress = (PageProgressView) findViewById( R.id.progress_horizontal); - mVoiceSearchIntent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH); - mVoiceSearchIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, - RecognizerIntent.LANGUAGE_MODEL_WEB_SEARCH); - // This extra tells voice search not to send the application id in its - // results intent - http://b/2546173 - // - // TODO: Make a constant for this extra. - mVoiceSearchIntent.putExtra("android.speech.extras.SEND_APPLICATION_ID_EXTRA", - false); - PackageManager pm = activity.getPackageManager(); - ResolveInfo ri = pm.resolveActivity(mVoiceSearchIntent, - PackageManager.MATCH_DEFAULT_ONLY); Resources resources = getResources(); - if (ri == null) { - mVoiceSearchIntent = null; - } else { - mVoiceDrawable = resources.getDrawable( - android.R.drawable.ic_btn_speak_now); - } + mVoiceDrawable = resources.getDrawable( + android.R.drawable.ic_btn_speak_now); mBookmarkDrawable = mBookmarkButton.getDrawable(); mArcsSpan = new ImageSpan(activity, R.drawable.arcs, ImageSpan.ALIGN_BASELINE); } @Override + public int getEmbeddedHeight() { + int height = mContainer.getHeight(); + return height; + } + + @Override public void createContextMenu(ContextMenu menu) { MenuInflater inflater = mActivity.getMenuInflater(); inflater.inflate(R.menu.title_context, menu); @@ -114,7 +101,7 @@ public class TitleBar extends TitleBarBase implements OnFocusChangeListener, @Override void setInVoiceMode(boolean inVoiceMode) { if (mInVoiceMode == inVoiceMode) return; - mInVoiceMode = inVoiceMode && mVoiceSearchIntent != null; + mInVoiceMode = inVoiceMode && mUiController.supportsVoiceSearch(); Drawable titleDrawable; if (mInVoiceMode) { mBookmarkButton.setImageDrawable(mVoiceDrawable); diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java index 5f02002..ee46561 100644 --- a/src/com/android/browser/TitleBarXLarge.java +++ b/src/com/android/browser/TitleBarXLarge.java @@ -18,9 +18,7 @@ package com.android.browser; import com.android.browser.UI.DropdownChangeListener; import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher; -import com.android.browser.search.SearchEngine; -import android.accounts.Account; import android.app.Activity; import android.content.Context; import android.content.res.Resources; @@ -477,10 +475,8 @@ public class TitleBarXLarge extends TitleBarBase } private void setSearchMode(boolean voiceSearchEnabled) { - SearchEngine searchEngine = BrowserSettings.getInstance() - .getSearchEngine(); boolean showvoicebutton = voiceSearchEnabled && - (searchEngine != null && searchEngine.supportsVoiceSearch()); + mUiController.supportsVoiceSearch(); mVoiceSearch.setVisibility(showvoicebutton ? View.VISIBLE : View.GONE); mGoButton.setVisibility(voiceSearchEnabled ? View.GONE : diff --git a/src/com/android/browser/UiController.java b/src/com/android/browser/UiController.java index 65fa5f8..c22494b 100644 --- a/src/com/android/browser/UiController.java +++ b/src/com/android/browser/UiController.java @@ -60,6 +60,8 @@ public interface UiController extends BookmarksHistoryCallbacks { void startVoiceSearch(); + boolean supportsVoiceSearch(); + void showVoiceSearchResults(String title); void editUrl(); diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java index 13018af..92fdc97 100644 --- a/src/com/android/browser/XLargeUi.java +++ b/src/com/android/browser/XLargeUi.java @@ -16,7 +16,7 @@ package com.android.browser; -import com.android.browser.ScrollWebView.ScrollListener; +import com.android.browser.BrowserWebView.ScrollListener; import android.animation.Animator; import android.animation.Animator.AnimatorListener; @@ -149,23 +149,14 @@ public class XLargeUi extends BaseUi implements ScrollListener { @Override public WebView createWebView(boolean privateBrowsing) { // Create a new WebView - ScrollWebView w = new ScrollWebView(mActivity, null, - android.R.attr.webViewStyle, privateBrowsing); - initWebViewSettings(w); + BrowserWebView w = (BrowserWebView) super.createWebView(privateBrowsing); w.setScrollListener(this); - boolean supportsMultiTouch = mActivity.getPackageManager() - .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH); - w.getSettings().setDisplayZoomControls(!supportsMultiTouch); - w.setExpandedTileBounds(true); // smoother scrolling return w; } @Override public WebView createSubWebView(boolean privateBrowsing) { - ScrollWebView web = (ScrollWebView) createWebView(privateBrowsing); - // no scroll listener for subview - web.setScrollListener(null); - return web; + return super.createWebView(privateBrowsing); } @Override @@ -174,7 +165,7 @@ public class XLargeUi extends BaseUi implements ScrollListener { } void stopWebViewScrolling() { - ScrollWebView web = (ScrollWebView) mUiController.getCurrentWebView(); + BrowserWebView web = (BrowserWebView) mUiController.getCurrentWebView(); if (web != null) { web.stopScroll(); } @@ -237,7 +228,7 @@ public class XLargeUi extends BaseUi implements ScrollListener { @Override void setActiveTab(Tab tab, boolean needsAttaching) { - ScrollWebView view = (ScrollWebView) tab.getWebView(); + BrowserWebView view = (BrowserWebView) tab.getWebView(); // TabControl.setCurrentTab has been called before this, // so the tab is guaranteed to have a webview if (view == null) { diff --git a/src/com/android/browser/preferences/LabPreferencesFragment.java b/src/com/android/browser/preferences/LabPreferencesFragment.java index a06dc3e..88a9690 100644 --- a/src/com/android/browser/preferences/LabPreferencesFragment.java +++ b/src/com/android/browser/preferences/LabPreferencesFragment.java @@ -42,21 +42,25 @@ public class LabPreferencesFragment extends PreferenceFragment addPreferencesFromResource(R.xml.lab_preferences); Preference e = findPreference(BrowserSettings.PREF_QUICK_CONTROLS); - e.setOnPreferenceChangeListener(this); + if (e != null) { + e.setOnPreferenceChangeListener(this); + } useInstantPref = findPreference(BrowserSettings.PREF_USE_INSTANT); } @Override public void onResume() { super.onResume(); - useInstantPref.setEnabled(false); + if (useInstantPref != null) { + useInstantPref.setEnabled(false); - // Enable the "use instant" preference only if the selected - // search engine is google. - if (mBrowserSettings.getSearchEngine() != null) { - final String currentName = mBrowserSettings.getSearchEngine().getName(); - if (SearchEngine.GOOGLE.equals(currentName)) { - useInstantPref.setEnabled(true); + // Enable the "use instant" preference only if the selected + // search engine is google. + if (mBrowserSettings.getSearchEngine() != null) { + final String currentName = mBrowserSettings.getSearchEngine().getName(); + if (SearchEngine.GOOGLE.equals(currentName)) { + useInstantPref.setEnabled(true); + } } } } |
