diff options
Diffstat (limited to 'res')
70 files changed, 720 insertions, 57 deletions
diff --git a/res/anim/find_dialog_enter.xml b/res/anim/dialog_enter.xml index 5e597a4..6fbcb9e 100644 --- a/res/anim/find_dialog_enter.xml +++ b/res/anim/dialog_enter.xml @@ -16,6 +16,6 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/decelerate_interpolator"> - <translate android:fromYDelta="25%" android:toYDelta="0" android:duration="75"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="75" /> + <translate android:fromYDelta="-25%" android:toYDelta="0" android:duration="75"/> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="75" /> </set> diff --git a/res/anim/find_dialog_exit.xml b/res/anim/dialog_exit.xml index 854abd0..9845849 100644 --- a/res/anim/find_dialog_exit.xml +++ b/res/anim/dialog_exit.xml @@ -16,7 +16,7 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromYDelta="0" android:toYDelta="50%" android:duration="50"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="50" /> + <translate android:fromYDelta="0" android:toYDelta="-50%" android:duration="50"/> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="50" /> </set> diff --git a/res/drawable-hdpi/button_selected.png b/res/drawable-hdpi/button_selected.png Binary files differnew file mode 100644 index 0000000..752deda --- /dev/null +++ b/res/drawable-hdpi/button_selected.png diff --git a/res/drawable-hdpi/default_video_poster.png b/res/drawable-hdpi/default_video_poster.png Binary files differnew file mode 100644 index 0000000..9bbaf9c --- /dev/null +++ b/res/drawable-hdpi/default_video_poster.png diff --git a/res/drawable-hdpi/ic_arrow_left.png b/res/drawable-hdpi/ic_arrow_left.png Binary files differnew file mode 100644 index 0000000..bcbe3f6 --- /dev/null +++ b/res/drawable-hdpi/ic_arrow_left.png diff --git a/res/drawable-hdpi/ic_arrow_right.png b/res/drawable-hdpi/ic_arrow_right.png Binary files differnew file mode 100644 index 0000000..6095533 --- /dev/null +++ b/res/drawable-hdpi/ic_arrow_right.png diff --git a/res/drawable-hdpi/ic_btn_copy.png b/res/drawable-hdpi/ic_btn_copy.png Binary files differnew file mode 100644 index 0000000..04fda7f --- /dev/null +++ b/res/drawable-hdpi/ic_btn_copy.png diff --git a/res/drawable-hdpi/ic_btn_find.png b/res/drawable-hdpi/ic_btn_find.png Binary files differnew file mode 100755 index 0000000..20e1fbc --- /dev/null +++ b/res/drawable-hdpi/ic_btn_find.png diff --git a/res/drawable-hdpi/ic_btn_select_all.png b/res/drawable-hdpi/ic_btn_select_all.png Binary files differnew file mode 100644 index 0000000..839915b --- /dev/null +++ b/res/drawable-hdpi/ic_btn_select_all.png diff --git a/res/drawable-hdpi/ic_btn_share.png b/res/drawable-hdpi/ic_btn_share.png Binary files differnew file mode 100644 index 0000000..44db9b1 --- /dev/null +++ b/res/drawable-hdpi/ic_btn_share.png diff --git a/res/drawable-hdpi/ic_menu.png b/res/drawable-hdpi/ic_menu.png Binary files differnew file mode 100644 index 0000000..00f784f --- /dev/null +++ b/res/drawable-hdpi/ic_menu.png diff --git a/res/drawable-hdpi/ic_menu_downloads.png b/res/drawable-hdpi/ic_menu_downloads.png Binary files differnew file mode 100644 index 0000000..c85f6a2 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_downloads.png diff --git a/res/drawable-hdpi/ic_menu_find.png b/res/drawable-hdpi/ic_menu_find.png Binary files differnew file mode 100644 index 0000000..17ac694 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_find.png diff --git a/res/drawable-hdpi/ic_menu_pageinfo.png b/res/drawable-hdpi/ic_menu_pageinfo.png Binary files differnew file mode 100644 index 0000000..293a021 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_pageinfo.png diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png Binary files differnew file mode 100644 index 0000000..46be101 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_settings.png diff --git a/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png Binary files differnew file mode 100644 index 0000000..4b69736 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_share.png diff --git a/res/drawable-hdpi/ic_pages.png b/res/drawable-hdpi/ic_pages.png Binary files differnew file mode 100644 index 0000000..3fc2e46 --- /dev/null +++ b/res/drawable-hdpi/ic_pages.png diff --git a/res/drawable-hdpi/ic_reload.png b/res/drawable-hdpi/ic_reload.png Binary files differnew file mode 100644 index 0000000..ebad6da --- /dev/null +++ b/res/drawable-hdpi/ic_reload.png diff --git a/res/drawable-hdpi/ic_star.png b/res/drawable-hdpi/ic_star.png Binary files differnew file mode 100644 index 0000000..666c670 --- /dev/null +++ b/res/drawable-hdpi/ic_star.png diff --git a/res/drawable-hdpi/ic_stop.png b/res/drawable-hdpi/ic_stop.png Binary files differnew file mode 100644 index 0000000..0f1337f --- /dev/null +++ b/res/drawable-hdpi/ic_stop.png diff --git a/res/drawable-hdpi/pattern_carbon_fiber_dark.png b/res/drawable-hdpi/pattern_carbon_fiber_dark.png Binary files differnew file mode 100644 index 0000000..cc8e0c5 --- /dev/null +++ b/res/drawable-hdpi/pattern_carbon_fiber_dark.png diff --git a/res/drawable-hdpi/progress_stop.png b/res/drawable-hdpi/progress_stop.png Binary files differnew file mode 100644 index 0000000..aacece2 --- /dev/null +++ b/res/drawable-hdpi/progress_stop.png diff --git a/res/drawable-hdpi/tab_selected_bg.9.png b/res/drawable-hdpi/tab_selected_bg.9.png Binary files differnew file mode 100644 index 0000000..4e0f740 --- /dev/null +++ b/res/drawable-hdpi/tab_selected_bg.9.png diff --git a/res/drawable-hdpi/tab_unselected_bg.9.png b/res/drawable-hdpi/tab_unselected_bg.9.png Binary files differnew file mode 100644 index 0000000..9ab7c56 --- /dev/null +++ b/res/drawable-hdpi/tab_unselected_bg.9.png diff --git a/res/drawable-mdpi/button_selected.png b/res/drawable-mdpi/button_selected.png Binary files differnew file mode 100644 index 0000000..4fd1aa3 --- /dev/null +++ b/res/drawable-mdpi/button_selected.png diff --git a/res/drawable/default_video_poster.png b/res/drawable-mdpi/default_video_poster.png Binary files differindex f457f23..f457f23 100755 --- a/res/drawable/default_video_poster.png +++ b/res/drawable-mdpi/default_video_poster.png diff --git a/res/drawable-mdpi/ic_arrow_left.png b/res/drawable-mdpi/ic_arrow_left.png Binary files differnew file mode 100644 index 0000000..58fd2ca --- /dev/null +++ b/res/drawable-mdpi/ic_arrow_left.png diff --git a/res/drawable-mdpi/ic_arrow_right.png b/res/drawable-mdpi/ic_arrow_right.png Binary files differnew file mode 100644 index 0000000..aaf3fde --- /dev/null +++ b/res/drawable-mdpi/ic_arrow_right.png diff --git a/res/drawable-mdpi/ic_btn_copy.png b/res/drawable-mdpi/ic_btn_copy.png Binary files differnew file mode 100644 index 0000000..04fda7f --- /dev/null +++ b/res/drawable-mdpi/ic_btn_copy.png diff --git a/res/drawable-mdpi/ic_btn_find.png b/res/drawable-mdpi/ic_btn_find.png Binary files differnew file mode 100755 index 0000000..20e1fbc --- /dev/null +++ b/res/drawable-mdpi/ic_btn_find.png diff --git a/res/drawable-mdpi/ic_btn_select_all.png b/res/drawable-mdpi/ic_btn_select_all.png Binary files differnew file mode 100644 index 0000000..839915b --- /dev/null +++ b/res/drawable-mdpi/ic_btn_select_all.png diff --git a/res/drawable-mdpi/ic_btn_share.png b/res/drawable-mdpi/ic_btn_share.png Binary files differnew file mode 100644 index 0000000..44db9b1 --- /dev/null +++ b/res/drawable-mdpi/ic_btn_share.png diff --git a/res/drawable-mdpi/ic_menu.png b/res/drawable-mdpi/ic_menu.png Binary files differnew file mode 100644 index 0000000..520b2c3 --- /dev/null +++ b/res/drawable-mdpi/ic_menu.png diff --git a/res/drawable-mdpi/ic_menu_downloads.png b/res/drawable-mdpi/ic_menu_downloads.png Binary files differnew file mode 100644 index 0000000..fff5022 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_downloads.png diff --git a/res/drawable-mdpi/ic_menu_find.png b/res/drawable-mdpi/ic_menu_find.png Binary files differnew file mode 100644 index 0000000..4d96348 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_find.png diff --git a/res/drawable-mdpi/ic_menu_pageinfo.png b/res/drawable-mdpi/ic_menu_pageinfo.png Binary files differnew file mode 100644 index 0000000..c04f0e3 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_pageinfo.png diff --git a/res/drawable-mdpi/ic_menu_settings.png b/res/drawable-mdpi/ic_menu_settings.png Binary files differnew file mode 100644 index 0000000..7a642d6 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_settings.png diff --git a/res/drawable-mdpi/ic_menu_share.png b/res/drawable-mdpi/ic_menu_share.png Binary files differnew file mode 100644 index 0000000..ea2b672 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_share.png diff --git a/res/drawable-mdpi/ic_pages.png b/res/drawable-mdpi/ic_pages.png Binary files differnew file mode 100644 index 0000000..fba4651 --- /dev/null +++ b/res/drawable-mdpi/ic_pages.png diff --git a/res/drawable-mdpi/ic_reload.png b/res/drawable-mdpi/ic_reload.png Binary files differnew file mode 100644 index 0000000..ec0c238 --- /dev/null +++ b/res/drawable-mdpi/ic_reload.png diff --git a/res/drawable-mdpi/ic_star.png b/res/drawable-mdpi/ic_star.png Binary files differnew file mode 100644 index 0000000..20a40de --- /dev/null +++ b/res/drawable-mdpi/ic_star.png diff --git a/res/drawable-mdpi/ic_stop.png b/res/drawable-mdpi/ic_stop.png Binary files differnew file mode 100644 index 0000000..7ee56e9 --- /dev/null +++ b/res/drawable-mdpi/ic_stop.png diff --git a/res/drawable/pattern_carbon_fiber_dark.png b/res/drawable-mdpi/pattern_carbon_fiber_dark.png Binary files differindex 07af4b6..07af4b6 100644 --- a/res/drawable/pattern_carbon_fiber_dark.png +++ b/res/drawable-mdpi/pattern_carbon_fiber_dark.png diff --git a/res/drawable-mdpi/progress_stop.png b/res/drawable-mdpi/progress_stop.png Binary files differnew file mode 100644 index 0000000..a85f987 --- /dev/null +++ b/res/drawable-mdpi/progress_stop.png diff --git a/res/drawable-mdpi/tab_selected_bg.9.png b/res/drawable-mdpi/tab_selected_bg.9.png Binary files differnew file mode 100644 index 0000000..5e6b1ed --- /dev/null +++ b/res/drawable-mdpi/tab_selected_bg.9.png diff --git a/res/drawable-mdpi/tab_unselected_bg.9.png b/res/drawable-mdpi/tab_unselected_bg.9.png Binary files differnew file mode 100644 index 0000000..c19443a --- /dev/null +++ b/res/drawable-mdpi/tab_unselected_bg.9.png diff --git a/res/values/themes.xml b/res/drawable/browserbarbutton.xml index bb922dd..35a6f48 100644 --- a/res/values/themes.xml +++ b/res/drawable/browserbarbutton.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2010 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,15 +14,8 @@ limitations under the License. --> -<resources> - <style name="FindDialogTheme"> - <item name="android:windowFrame">@null</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowIsTranslucent">true</item> - <item name="android:windowNoTitle">true</item> - <item name="android:background">@null</item> - <item name="android:windowBackground">@null</item> - <item name="android:windowAnimationStyle">@style/FindDialog</item> - <item name="android:backgroundDimEnabled">false</item> - </style> -</resources> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/button_selected" /> + <item android:state_pressed="false" android:drawable="@drawable/clear" /> +</selector> diff --git a/res/drawable/clear.xml b/res/drawable/clear.xml new file mode 100644 index 0000000..5973f5c --- /dev/null +++ b/res/drawable/clear.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Used by browserbarbutton to show a clear background for the non pressed + state --> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#00000000"/> + <padding android:left="9dp" android:top="9dp" + android:right="9dp" android:bottom="9dp" /> +</shape> diff --git a/res/drawable/progress.xml b/res/drawable/progress.xml new file mode 100644 index 0000000..dd7c375 --- /dev/null +++ b/res/drawable/progress.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:id="@android:id/background"> + <shape> + <solid android:color="#ffffffff"/> + </shape> + </item> + <item android:id="@android:id/progress"> + <clip> + <shape> + <solid android:color="#ff94b73f"/> + </shape> + </clip> + </item> + +</layer-list> diff --git a/res/drawable/tab_unselected.xml b/res/drawable/tab_unselected.xml new file mode 100644 index 0000000..1f22ae1 --- /dev/null +++ b/res/drawable/tab_unselected.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#00000000"/> + <stroke android:width="3dp" android:color="#ff404040"/> + <padding android:left="9dp" android:top="9dp" + android:right="9dp" android:bottom="9dp" /> +</shape> diff --git a/res/drawable/textfield_nostroke.xml b/res/drawable/textfield_nostroke.xml new file mode 100644 index 0000000..2945056 --- /dev/null +++ b/res/drawable/textfield_nostroke.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#ffd0d0d0"/> + <stroke android:width="1dp" android:color="#ff94b73f"/> + <padding android:left="9dp" android:top="9dp" + android:right="9dp" android:bottom="9dp" /> +</shape> diff --git a/res/drawable/textfield_stroke.xml b/res/drawable/textfield_stroke.xml new file mode 100644 index 0000000..4d4c74e --- /dev/null +++ b/res/drawable/textfield_stroke.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#ffffffff"/> + <stroke android:width="3dp" android:color="#ff94b73f"/> + <padding android:left="9dp" android:top="9dp" + android:right="9dp" android:bottom="9dp" /> +</shape> diff --git a/res/layout-land/title_bar_tabbed.xml b/res/layout-land/title_bar_tabbed.xml new file mode 100644 index 0000000..853dbeb --- /dev/null +++ b/res/layout-land/title_bar_tabbed.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> + <!-- + Copyright 2010, The Android Open Source Project Licensed under the + Apache License, Version 2.0 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of the + License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/tabbedtitleland" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingLeft="6dip" + android:paddingRight="6dip" + android:background="#ffdddddd"> + <ImageButton + android:id="@+id/back" + android:src="@drawable/ic_arrow_left" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/forward" + android:src="@drawable/ic_arrow_right" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/star" + android:src="@drawable/ic_star" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <com.android.browser.TabScrollView + android:id="@+id/tabs" + android:layout_width="0dip" + android:layout_weight="1.0" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + <com.android.browser.UrlInputView + android:id="@+id/editurl" + android:layout_width="0dip" + android:layout_weight="1.0" + android:layout_height="wrap_content" + android:layout_marginLeft="3dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/black" + android:gravity="center_vertical" + android:singleLine="true" + android:ellipsize="end" + android:lines="1" + android:scrollHorizontally="true" + android:visibility="gone" + android:background="@drawable/textfield_stroke" + android:inputType="textUri" + android:imeOptions="actionGo" /> + <ImageButton + android:id="@+id/newtab" + android:src="@drawable/ic_menu_new_window" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/menu" + android:src="@drawable/ic_menu" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/all_btn" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:scaleType="center" + android:background="@drawable/browserbarbutton" + android:src="@drawable/ic_pages" /> +</LinearLayout> diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml index 1f017d0..363e632 100644 --- a/res/layout/bookmark_thumbnail.xml +++ b/res/layout/bookmark_thumbnail.xml @@ -35,7 +35,7 @@ <LinearLayout android:id="@+id/holder" android:layout_height="match_parent" android:layout_width="match_parent" - android:orientation="horizontal" + android:orientation="vertical" android:background="#99000000" android:gravity="center" android:layout_alignBottom="@+id/thumb" diff --git a/res/layout/browser_add_bookmark_const_url.xml b/res/layout/browser_add_bookmark_const_url.xml new file mode 100644 index 0000000..c6603f4 --- /dev/null +++ b/res/layout/browser_add_bookmark_const_url.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + > + + <ImageView android:id="@+id/titleDivider" + android:layout_width="match_parent" + android:layout_height="1dip" + android:scaleType="fitXY" + android:gravity="fill_horizontal" + android:src="@drawable/dialog_divider_horizontal_light" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip"/> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + android:paddingTop="5dip" + android:paddingBottom="13dip" + android:paddingLeft="20dip" + android:paddingRight="20dip" > + + <TextView + android:id="@+id/titleText" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="@string/name" + android:gravity="left" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/title" + android:layout_height="wrap_content" + android:layout_width="250dip" + android:gravity="fill_horizontal" + android:inputType="textCapSentences" + android:selectAllOnFocus="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#c6c3c6" + android:minHeight="54dip" + android:orientation="horizontal" + android:paddingTop="4dip" + android:paddingLeft="2dip" + android:paddingRight="2dip" > + <Button android:id="@+id/OK" + android:text="@string/save" + android:layout_width="0dip" + android:layout_gravity="left" + android:layout_weight="1" + android:maxLines="2" + android:layout_height="wrap_content" /> + <Button android:id="@+id/cancel" + android:text="@string/do_not_save" + android:layout_width="0dip" + android:layout_gravity="right" + android:layout_weight="1" + android:maxLines="2" + android:layout_height="wrap_content" /> + </LinearLayout> + +</LinearLayout> + diff --git a/res/layout/browser_select.xml b/res/layout/browser_select.xml new file mode 100644 index 0000000..b30be8d --- /dev/null +++ b/res/layout/browser_select.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/selectControls" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="5dip" + android:paddingLeft="4dip" + android:paddingRight="4dip" + android:paddingBottom="1dip" + android:background="@android:drawable/bottom_bar"> + <ImageButton + android:src="@drawable/ic_btn_copy" + android:id="@+id/copy" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + + <ImageButton + android:src="@drawable/ic_btn_share" + android:id="@+id/share" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + + <ImageButton + android:src="@drawable/ic_btn_select_all" + android:id="@+id/select_all" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + + <ImageButton + android:src="@drawable/ic_btn_find" + android:id="@+id/find" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + + <LinearLayout + android:layout_height="fill_parent" + android:layout_width="fill_parent" + android:layout_weight="1" + /> + + <ImageButton + android:src="@drawable/ic_btn_close_panel" + android:id="@+id/done" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> +</LinearLayout> + diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml index 76d72d5..adf3284 100644 --- a/res/layout/browser_subwindow.xml +++ b/res/layout/browser_subwindow.xml @@ -23,6 +23,7 @@ android:layout_height="match_parent" android:padding="10dip" > <LinearLayout + android:id="@+id/inner_container" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml index 90dc324..525f30c 100644 --- a/res/layout/custom_screen.xml +++ b/res/layout/custom_screen.xml @@ -22,6 +22,7 @@ android:layout_height="match_parent" /> <LinearLayout android:orientation="vertical" + android:id="@+id/vertical_layout" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout/simple_dropdown_item_2line.xml b/res/layout/simple_dropdown_item_2line.xml new file mode 100644 index 0000000..8b955ec --- /dev/null +++ b/res/layout/simple_dropdown_item_2line.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml +** +** Copyright 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. +*/ +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:gravity="center_vertical" + android:baselineAligned="false"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/icon1" + android:scaleType="center" + android:paddingLeft="2dip" + android:paddingRight="2dip" /> + <TwoLineListItem + android:paddingTop="2dip" + android:paddingBottom="2dip" + android:layout_width="0dip" + android:layout_weight="1" + android:layout_height="wrap_content" + android:mode="twoLine"> + <TextView + android:id="@android:id/text1" + style="?android:attr/dropDownItemStyle" + android:textAppearance="?android:attr/textAppearanceLargeInverse" + android:singleLine="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <TextView + android:id="@android:id/text2" + style="?android:attr/dropDownItemStyle" + android:textAppearance="?android:attr/textAppearanceSmallInverse" + android:textColor="#323232" + android:singleLine="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@android:id/text1" + android:layout_alignLeft="@android:id/text1" /> + </TwoLineListItem> +</LinearLayout> diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml new file mode 100644 index 0000000..28b553d --- /dev/null +++ b/res/layout/tab_title.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> + <!-- + Copyright 2010, The Android Open Source Project Licensed under the + Apache License, Version 2.0 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of the + License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="0dip" + android:layout_weight="1.0" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal"> + <ImageView + android:id="@+id/favicon" + android:layout_width="20dip" + android:layout_height="20dip" + android:layout_marginLeft="3dip" /> + <ImageView + android:id="@+id/lock" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:visibility="gone" /> + <TextView + android:id="@+id/title" + android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_weight="1.0" + android:layout_marginLeft="3dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/black" + android:gravity="center_vertical" + android:singleLine="true" + android:ellipsize="end" /> + <com.android.browser.CircularProgressView + android:id="@+id/stop" + android:layout_width="36dip" + android:layout_height="36dip" + android:background="@null" + android:src="@drawable/progress_stop" /> + <ImageView + android:id="@+id/close" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:src="@drawable/btn_close_window" /> +</LinearLayout> diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index 9f0cb51..d6a77e0 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -90,7 +90,7 @@ android:layout_marginRight="-5dip" android:scaleType="center" android:background="@drawable/btn_bookmark" - android:src="@drawable/ic_btn_bookmarks" + android:src="@drawable/ic_list_bookmark" /> </LinearLayout> </LinearLayout> diff --git a/res/layout/title_bar_tabbed.xml b/res/layout/title_bar_tabbed.xml new file mode 100644 index 0000000..fc786e0 --- /dev/null +++ b/res/layout/title_bar_tabbed.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="utf-8"?> + <!-- + Copyright 2010, The Android Open Source Project Licensed under the + Apache License, Version 2.0 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of the + License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/tabbedtitleport" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="#ffdddddd"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <com.android.browser.TabScrollView + android:id="@+id/tabs" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1.0" + android:orientation="horizontal" /> + <ImageButton + android:id="@+id/newtab" + android:src="@drawable/ic_menu_new_window" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:background="@drawable/browserbarbutton" /> + </LinearLayout> + <LinearLayout + android:id="@+id/urlbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingLeft="6dip" + android:paddingRight="6dip"> + <ImageButton + android:id="@+id/back" + android:src="@drawable/ic_arrow_left" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/forward" + android:src="@drawable/ic_arrow_right" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/star" + android:src="@drawable/ic_star" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <com.android.browser.UrlInputView + android:id="@+id/editurl" + android:layout_width="0dip" + android:layout_weight="1.0" + android:layout_height="wrap_content" + android:layout_marginLeft="3dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/black" + android:gravity="center_vertical" + android:singleLine="true" + android:ellipsize="end" + android:lines="1" + android:scrollHorizontally="true" + android:visibility="gone" + android:background="@drawable/textfield_nostroke" + android:inputType="textUri" + android:imeOptions="actionGo" /> + <ImageButton + android:id="@+id/menu" + android:src="@drawable/ic_menu" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginRight="6dip" + android:background="@drawable/browserbarbutton" /> + <ImageButton + android:id="@+id/all_btn" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:scaleType="center" + android:background="@drawable/browserbarbutton" + android:src="@drawable/ic_pages" /> + </LinearLayout> +</LinearLayout> diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml new file mode 100644 index 0000000..0fc20be --- /dev/null +++ b/res/menu-xlarge/browser.xml @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <group android:id="@+id/MAIN_MENU"> + <item android:id="@+id/new_tab_menu_id" + android:title="@string/new_tab" + android:icon="@drawable/ic_menu_new_window" + android:alphabeticShortcut="n" /> + <item android:id="@+id/active_tabs_menu_id" + android:title="@string/active_tabs" + android:icon="@drawable/ic_menu_windows" + android:alphabeticShortcut="t" /> + <item android:id="@+id/find_menu_id" + android:title="@string/find_dot" + android:icon="@drawable/ic_menu_find" + android:alphabeticShortcut="f" /> + <item android:id="@+id/share_page_menu_id" + android:title="@string/share_page" + android:icon="@drawable/ic_menu_share" + android:alphabeticShortcut="s" /> + <item android:id="@+id/page_info_menu_id" + android:title="@string/page_info" + android:icon="@drawable/ic_menu_pageinfo" + android:alphabeticShortcut="g" /> + <item android:id="@+id/view_downloads_menu_id" + android:title="@string/menu_view_download" + android:icon="@drawable/ic_menu_downloads" + android:alphabeticShortcut="d" /> + <item android:id="@+id/preferences_menu_id" + android:title="@string/menu_preferences" + android:icon="@drawable/ic_menu_settings" + android:alphabeticShortcut="p" /> + <item android:id="@+id/save_webarchive_menu_id" + android:title="@string/menu_save_webarchive" /> + <!-- followings are debug only --> + <item android:id="@+id/dump_nav_menu_id" + android:title="@string/dump_nav" + android:visible="false" /> + <item android:id="@+id/dump_counters_menu_id" + android:title="@string/dump_counters" + android:visible="false" /> + </group> + <group android:id="@+id/MAIN_SHORTCUT_MENU" android:visible="false"> + <item android:id="@+id/homepage_menu_id" + android:alphabeticShortcut=" " /> + <item android:id="@+id/classic_history_menu_id" + android:alphabeticShortcut="h" /> + <item android:id="@+id/zoom_in_menu_id" + android:alphabeticShortcut="i" /> + <item android:id="@+id/zoom_out_menu_id" + android:alphabeticShortcut="o" /> + <item android:id="@+id/window_one_menu_id" + android:alphabeticShortcut="1" /> + <item android:id="@+id/window_two_menu_id" + android:alphabeticShortcut="2" /> + <item android:id="@+id/window_three_menu_id" + android:alphabeticShortcut="3" /> + <item android:id="@+id/window_four_menu_id" + android:alphabeticShortcut="4" /> + <item android:id="@+id/window_five_menu_id" + android:alphabeticShortcut="5" /> + <item android:id="@+id/window_six_menu_id" + android:alphabeticShortcut="6" /> + <item android:id="@+id/window_seven_menu_id" + android:alphabeticShortcut="7" /> + <item android:id="@+id/window_eight_menu_id" + android:alphabeticShortcut="8" /> + <item android:id="@+id/back_menu_id" + android:alphabeticShortcut="j" /> + <item android:id="@+id/forward_menu_id" + android:alphabeticShortcut="k" /> + <item android:id="@+id/bookmarks_menu_id" + android:alphabeticShortcut="b" /> + <item android:id="@+id/add_bookmark_menu_id" + android:alphabeticShortcut="a" /> + <item android:id="@+id/stop_reload_menu_id" + android:alphabeticShortcut="r" /> + <item android:id="@+id/goto_menu_id" + android:alphabeticShortcut="l" /> + <item android:id="@+id/close_menu_id" + android:alphabeticShortcut="w" /> + </group> +</menu> diff --git a/res/menu/browser.xml b/res/menu/browser.xml index 4793c21..adb1bad 100644 --- a/res/menu/browser.xml +++ b/res/menu/browser.xml @@ -41,22 +41,26 @@ android:alphabeticShortcut="a" /> <item android:id="@+id/find_menu_id" android:title="@string/find_dot" + android:icon="@drawable/ic_menu_find" android:alphabeticShortcut="f" /> - <item android:id="@+id/select_text_id" - android:title="@string/select_dot" - android:alphabeticShortcut="e" /> - <item android:id="@+id/page_info_menu_id" - android:title="@string/page_info" - android:alphabeticShortcut="g" /> <item android:id="@+id/share_page_menu_id" android:title="@string/share_page" + android:icon="@drawable/ic_menu_share" android:alphabeticShortcut="s" /> + <item android:id="@+id/page_info_menu_id" + android:title="@string/page_info" + android:icon="@drawable/ic_menu_pageinfo" + android:alphabeticShortcut="g" /> <item android:id="@+id/view_downloads_menu_id" android:title="@string/menu_view_download" + android:icon="@drawable/ic_menu_downloads" android:alphabeticShortcut="d" /> <item android:id="@+id/preferences_menu_id" android:title="@string/menu_preferences" + android:icon="@drawable/ic_menu_settings" android:alphabeticShortcut="p" /> + <item android:id="@+id/save_webarchive_menu_id" + android:title="@string/menu_save_webarchive" /> <!-- followings are debug only --> <item android:id="@+id/dump_nav_menu_id" android:title="@string/dump_nav" @@ -91,16 +95,10 @@ <item android:id="@+id/window_eight_menu_id" android:alphabeticShortcut="8" /> <item android:id="@+id/back_menu_id" - android:title="@string/back" - android:drawable="@*android:drawable/ic_menu_back" android:alphabeticShortcut="j" /> <item android:id="@+id/goto_menu_id" - android:title="@string/goto_dot" - android:alphabeticShortcut="l" - android:icon="@android:drawable/ic_menu_search"/> + android:alphabeticShortcut="l" /> <item android:id="@+id/close_menu_id" - android:icon="@drawable/ic_btn_close_panel" - android:title="@string/tab_picker_remove_tab" android:alphabeticShortcut="w" /> </group> <!-- these items are toggled in and out of @+id/stop_reload_menu_id --> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index e9df9f4..7efb620 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -38,7 +38,7 @@ <item quantity="few" msgid="5544267486978946555">"<xliff:g id="NUMBER">%d</xliff:g> Treffer"</item> <item quantity="other" msgid="6616125067364315405">"<xliff:g id="NUMBER">%d</xliff:g> Treffer"</item> </plurals> - <string name="title_bar_loading" msgid="7438217780834640678">"Wird geladen..."</string> + <string name="title_bar_loading" msgid="7438217780834640678">"Ladevorgang läuft..."</string> <string name="page_info" msgid="4048529256302257195">"Seiteninfo"</string> <string name="page_info_view" msgid="5303490449842635158">"Seiteninfo anzeigen"</string> <string name="page_info_address" msgid="2222306609532903254">"Adresse:"</string> @@ -112,7 +112,7 @@ <string name="contextmenu_copylink" msgid="5153657160294534270">"Link-URL kopieren"</string> <string name="contextmenu_download_image" msgid="4243829645180686912">"Bild speichern"</string> <string name="contextmenu_view_image" msgid="3870625602053600905">"Bild anzeigen"</string> - <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"Als Hintergrund festlegen"</string> + <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"Als Hintergrundbild festlegen"</string> <string name="contextmenu_dial_dot" msgid="5856550683415933806">"Wählen..."</string> <string name="contextmenu_add_contact" msgid="3183511922223645716">"Kontakt hinzufügen"</string> <string name="contextmenu_send_mail" msgid="1014513374828775660">"E-Mail senden"</string> @@ -289,5 +289,5 @@ <string name="website_settings_clear_all_dialog_message" msgid="6150502090601476333">"Alle Websitedaten und Standortberechtigungen werden gelöscht."</string> <string name="website_settings_clear_all_dialog_ok_button" msgid="6401582240627669431">"Alle Daten löschen"</string> <string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"Abbrechen"</string> - <string name="progress_dialog_setting_wallpaper" msgid="4871900779338536674">"Hintergrund wird eingestellt..."</string> + <string name="progress_dialog_setting_wallpaper" msgid="4871900779338536674">"Hintergrundbild wird eingestellt..."</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 02b06b1..d69b315 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -22,7 +22,7 @@ <string name="active_tabs" msgid="3050623868203544623">"Windows"</string> <string name="tab_bookmarks" msgid="2305793036003473653">"Marcadores"</string> <string name="tab_most_visited" msgid="1077402532455000703">"Más visitados"</string> - <string name="tab_history" msgid="1979267558744613746">"Historial "</string> + <string name="tab_history" msgid="1979267558744613746">"Historial"</string> <string name="added_to_bookmarks" msgid="1020224130695956728">"Agregado a marcadores"</string> <string name="removed_from_bookmarks" msgid="6063705902028438800">"Suprimido de los marcadores"</string> <string name="sign_in_to" msgid="5939425800148759165">"Iniciar sesión en <xliff:g id="HOSTNAME">%s1</xliff:g> \"<xliff:g id="REALM">%s2</xliff:g>\""</string> @@ -226,17 +226,17 @@ <string name="popup_window_attempt" msgid="2673111696288657989">"Este sitio está intentando abrir una ventana emergente."</string> <string name="allow" msgid="1157313689171991335">"Permitir"</string> <string name="block" msgid="9172175889884707800">"Bloquear"</string> - <string name="too_many_windows_dialog_title" msgid="5175503564948906442">"Se alcanzó el límite de la ventana "</string> + <string name="too_many_windows_dialog_title" msgid="5175503564948906442">"Se alcanzó el límite de la ventana"</string> <string name="too_many_windows_dialog_message" msgid="1398571800233959583">"No se ha podido abrir una ventana nueva porque ya has abierto el máximo permitido."</string> <string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"Ventana emergente ya abierta"</string> <string name="too_many_subwindows_dialog_message" msgid="5827289829907966657">"No es posible abrir una ventana emergente nueva porque sólo puede abrirse una por vez."</string> <string name="download_title" msgid="2122874021047565594">"Historial de descarga"</string> <string name="download_unknown_filename" msgid="4013465542563652175">"<Desconocido>"</string> <string name="download_menu_open" msgid="4888327480367757513">"Abrir"</string> - <string name="download_menu_clear" msgid="6264454531553418124">"Borrar de la lista\n "</string> + <string name="download_menu_clear" msgid="6264454531553418124">"Borrar de la lista"</string> <string name="download_menu_delete" msgid="8815502136393894148">"Eliminar"</string> <string name="download_menu_cancel" msgid="2545333007601851574">"Cancelar descarga"</string> - <string name="download_menu_cancel_all" msgid="2136550823151999166">"Cancelar todas las descargas\n "</string> + <string name="download_menu_cancel_all" msgid="2136550823151999166">"Cancelar todas las descargas"</string> <string name="download_cancel_dlg_title" msgid="8909108500262799748">"Cancelar descargas"</string> <string name="download_cancel_dlg_msg" msgid="6285389170052357797">"Las <xliff:g id="DOWNLOAD_COUNT">%d</xliff:g> descargas se cancelarán y se borrarán del historial de descarga."</string> <string name="download_delete_file" msgid="5330036497843073249">"El archivo se eliminará"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 6e19b2e..b976eeb 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -62,7 +62,7 @@ <string name="expires_on" msgid="8061200430557020704">"Дата окончания действия:"</string> <string name="stopping" msgid="4839698519340302982">"Остановка..."</string> <string name="stop" msgid="5687251076030630074">"Стоп"</string> - <string name="reload" msgid="8585220783228408062">"Обновить"</string> + <string name="reload" msgid="8585220783228408062">"Обновление"</string> <string name="back" msgid="8414603107175713668">"Назад"</string> <string name="forward" msgid="4288210890526641577">"Вперед"</string> <string name="save" msgid="5922311934992468496">"ОК"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index bbb698c..b4dafb1 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -90,7 +90,7 @@ <string name="switch_to_thumbnails" msgid="5493351529609043151">"Miniatyrvy"</string> <string name="switch_to_list" msgid="8900531247982121055">"Listvy"</string> <string name="current_page" msgid="7510129573681663135">"från "</string> - <string name="delete_bookmark_warning" msgid="758043186202032205">"Bokmärket <xliff:g id="BOOKMARK">%s</xliff:g> tas bort. "</string> + <string name="delete_bookmark_warning" msgid="758043186202032205">"Bokmärket <xliff:g id="BOOKMARK">%s</xliff:g> tas bort."</string> <string name="open_in_new_window" msgid="6596775546468054510">"Öppna i nytt fönster"</string> <string name="goto_dot" msgid="3895839050522602723">"Kör"</string> <string name="find_dot" msgid="6259312434696611957">"Sök på sidan"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 07c2eb9..0dcfa9e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -50,17 +50,16 @@ <!-- Label for a confirm button. Used in multiple contexts. --> <string name="ok">OK</string> - <!-- Displayed on the Find dialog to display the number of matches - found in the current page. --> + <!-- Displayed on the Find dialog when there are no matches --> + <string name="no_matches">No matches</string> + + <!-- Displayed on the Find dialog to display the index of the highlighted + match and total number of matches found in the current page. --> <plurals name="matches_found"> - <!-- Case of no matches --> - <item quantity="zero">No matches</item> <!-- Case of one match --> <item quantity="one">1 match</item> - <!-- Case of "few" (two) matches --> - <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> matches</item> - <!-- Case of several matches --> - <item quantity="other"><xliff:g id="number" example="137">%d</xliff:g> matches</item> + <!-- Case of multiple total matches --> + <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> of <xliff:g id="total" example="137">%d</xliff:g></item> </plurals> <!-- Displayed on the title bar while the page is loading --> @@ -138,12 +137,13 @@ <string name="name">Name</string> <!-- Initial value in Location field in Bookmark dialog box --> <string name="http">http://</string> - <!-- Menu item that opens a dialog to save a bookmark, initialized with the current page --> - <string name="save_to_bookmarks">Add bookmark</string> + <!-- Menu item that opens a dialog to save a bookmark for the current page, also displayed as + the title of the dialog used for adding a bookmark --> + <string name="save_to_bookmarks">Add to Bookmarks</string> <!-- Menu item on the bookmarks page, to edit an existing bookmark --> <string name="edit_bookmark">Edit bookmark</string> <!-- Context menu item to create a shortcut to the bookmark on the desktop --> - <string name="create_shortcut_bookmark">Add shortcut to Home</string> + <string name="create_shortcut_bookmark">Add to Home</string> <!-- Context menu item to open the currently highlighted bookmark --> <string name="open_bookmark">Open</string> <!-- Menu item to remove the currently highlighted bookmark--> @@ -217,6 +217,12 @@ <string name="copy_page_url">Copy page url</string> <!-- Menu item --> <string name="share_page">Share page</string> + <!-- Menu item for saving a page as a web archive. --> + <string name="menu_save_webarchive">Save as Web Archive</string> + <!-- Toast informing the user that the page has been saved. --> + <string name="webarchive_saved">Web archive saved.</string> + <!-- Toast informing the user that saving the page has failed. --> + <string name="webarchive_failed">Failed to save web archive.</string> <!-- Context Menu item open the currently selected link in the current window.--> <string name="contextmenu_openlink">Open</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4779aa1..2e8510a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -30,11 +30,6 @@ <item name="android:windowContentOverlay">@null</item> </style> - <style name="FindDialog"> - <item name="android:windowEnterAnimation">@anim/find_dialog_enter</item> - <item name="android:windowExitAnimation">@anim/find_dialog_exit</item> - </style> - <style name="TitleBar"> <item name="android:windowEnterAnimation">@anim/title_bar_enter</item> <item name="android:windowExitAnimation">@anim/title_bar_exit</item> |
