Bug 1335895 - part 36: Remove unused resource and layout used by deleted ZoomedView.java r=jchen,kats
MozReview-Commit-ID: IaShJNM6qw9
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -732,24 +732,16 @@ just addresses the organization to follo
<!-- Miscellaneous -->
<!-- LOCALIZATION NOTE (ellipsis): This text is appended to a piece of text that does not fit in the
designated space. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit
traditions in your locale. -->
<!ENTITY ellipsis "…">
<!ENTITY colon ":">
-<!-- LOCALIZATION NOTE (percent): The percent sign is appended after a number to
- display a percentage value. formatS is the number, #37 is the code to display a percent sign.
- This format string is typically used by getString method, in such method the percent sign
- is a reserved caracter. In order to display one percent sign in the result of getString,
- double percent signs must be inserted in the format string.
- This entity is used in the zoomed view to display the zoom factor-->
-<!ENTITY percent "&formatS;%%">
-
<!-- These are only used for accessibility for the done and overflow-menu buttons in the actionbar.
They are never shown to users -->
<!ENTITY actionbar_menu "Menu">
<!ENTITY actionbar_done "Done">
<!-- Voice search in the awesome bar -->
<!ENTITY voicesearch_prompt "Speak now">
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -42,22 +42,16 @@
android:layout_height="match_parent"
android:visibility="gone"/>
<view class="org.mozilla.gecko.media.VideoPlayer" android:id="@+id/video_player"
android:layout_height="match_parent"
android:layout_width="match_parent">
</view>
- <ViewStub android:id="@+id/zoomed_view_stub"
- android:inflatedId="@+id/zoomed_view"
- android:layout="@layout/zoomed_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
-
<FrameLayout android:id="@+id/home_screen_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<ViewStub android:id="@+id/home_pager_stub"
android:layout="@layout/home_pager"
android:layout_width="match_parent"
deleted file mode 100644
--- a/mobile/android/base/resources/layout/zoomed_view.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<org.mozilla.gecko.ZoomedView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:gecko="http://schemas.android.com/apk/res-auto"
- android:id="@+id/zoomed_view_container"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/dropshadow"
- android:padding="@dimen/drawable_dropshadow_size"
- android:visibility="gone">
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:background="@drawable/toolbar_grey_round">
- <!--
- Zoom factor button is invisible by default. Set ui.zoomedview.simplified to false
- in order to display the button in the zoomed view tool bar
- -->
- <TextView
- android:id="@+id/change_zoom_factor"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/zoomed_view_toolbar_height"
- android:background="@android:color/transparent"
- android:padding="12dip"
- android:layout_alignLeft="@+id/zoomed_image_view"
- android:textSize="16sp"
- android:textColor="@color/text_and_tabs_tray_grey"
- android:visibility="invisible"/>
- <ImageView
- android:id="@+id/dialog_close"
- android:scaleType="center"
- android:layout_width="@dimen/zoomed_view_toolbar_height"
- android:layout_height="@dimen/zoomed_view_toolbar_height"
- android:layout_alignRight="@id/zoomed_image_view"
- android:src="@drawable/close_edit_mode_selector"/>
- <ImageView
- android:id="@id/zoomed_image_view"
- android:layout_below="@id/change_zoom_factor"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
- </RelativeLayout>
-
-</org.mozilla.gecko.ZoomedView>
\ No newline at end of file
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -596,18 +596,16 @@
<string name="restrictable_feature_block_list">&restrictable_feature_block_list;</string>
<string name="restrictable_feature_block_list_description">&restrictable_feature_block_list_description;</string>
<!-- Miscellaneous -->
<string name="ellipsis">&ellipsis;</string>
<string name="colon">:</string>
- <string name="percent">&percent;</string>
-
<string name="remote_tabs_last_synced">&remote_tabs_last_synced;</string>
<string name="intent_uri_private_browsing_prompt">&intent_uri_private_browsing_prompt;</string>
<string name="intent_uri_private_browsing_multiple_match_title">&intent_uri_private_browsing_multiple_match_title;</string>
<string name="devtools_auth_scan_header">&devtools_auth_scan_header;</string>
<string name="unsupported_sdk_version">&unsupported_sdk_version;</string>