mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
f33a1a0d82
Since we no longer build the Search Activity stand-alone, we don't need the complication of the extra search-only resources package. Without the stand-alone build and repository, the probability of search resources being added to the Fennec resources (or being used in both places) approaches 1, so lets protect against that. --HG-- rename : mobile/android/search/res/color/facet_button_text_color.xml => mobile/android/base/resources/color/facet_button_text_color.xml rename : mobile/android/search/res/drawable-hdpi/ic_action_settings.png => mobile/android/base/resources/drawable-hdpi/ic_action_settings.png rename : mobile/android/search/res/drawable-hdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png rename : mobile/android/search/res/drawable-hdpi/ic_widget_search.png => mobile/android/base/resources/drawable-hdpi/ic_widget_search.png rename : mobile/android/search/res/drawable-hdpi/network_error.png => mobile/android/base/resources/drawable-hdpi/network_error.png rename : mobile/android/search/res/drawable-hdpi/search_clear.png => mobile/android/base/resources/drawable-hdpi/search_clear.png rename : mobile/android/search/res/drawable-hdpi/search_fox.png => mobile/android/base/resources/drawable-hdpi/search_fox.png rename : mobile/android/search/res/drawable-hdpi/search_history.png => mobile/android/base/resources/drawable-hdpi/search_history.png rename : mobile/android/search/res/drawable-hdpi/search_icon_active.png => mobile/android/base/resources/drawable-hdpi/search_icon_active.png rename : mobile/android/search/res/drawable-hdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png rename : mobile/android/search/res/drawable-hdpi/search_launcher.png => mobile/android/base/resources/drawable-hdpi/search_launcher.png rename : mobile/android/search/res/drawable-hdpi/search_plus.png => mobile/android/base/resources/drawable-hdpi/search_plus.png rename : mobile/android/search/res/drawable-hdpi/widget_bg.9.png => mobile/android/base/resources/drawable-hdpi/widget_bg.9.png rename : mobile/android/search/res/drawable-mdpi/ic_action_settings.png => mobile/android/base/resources/drawable-mdpi/ic_action_settings.png rename : mobile/android/search/res/drawable-mdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-mdpi/ic_widget_new_tab.png rename : mobile/android/search/res/drawable-mdpi/ic_widget_search.png => mobile/android/base/resources/drawable-mdpi/ic_widget_search.png rename : mobile/android/search/res/drawable-mdpi/network_error.png => mobile/android/base/resources/drawable-mdpi/network_error.png rename : mobile/android/search/res/drawable-mdpi/search_clear.png => mobile/android/base/resources/drawable-mdpi/search_clear.png rename : mobile/android/search/res/drawable-mdpi/search_fox.png => mobile/android/base/resources/drawable-mdpi/search_fox.png rename : mobile/android/search/res/drawable-mdpi/search_history.png => mobile/android/base/resources/drawable-mdpi/search_history.png rename : mobile/android/search/res/drawable-mdpi/search_icon_active.png => mobile/android/base/resources/drawable-mdpi/search_icon_active.png rename : mobile/android/search/res/drawable-mdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-mdpi/search_icon_inactive.png rename : mobile/android/search/res/drawable-mdpi/search_launcher.png => mobile/android/base/resources/drawable-mdpi/search_launcher.png rename : mobile/android/search/res/drawable-mdpi/search_plus.png => mobile/android/base/resources/drawable-mdpi/search_plus.png rename : mobile/android/search/res/drawable-mdpi/widget_bg.9.png => mobile/android/base/resources/drawable-mdpi/widget_bg.9.png rename : mobile/android/search/res/drawable-xhdpi/ic_action_settings.png => mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png rename : mobile/android/search/res/drawable-xhdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png rename : mobile/android/search/res/drawable-xhdpi/ic_widget_search.png => mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png rename : mobile/android/search/res/drawable-xhdpi/network_error.png => mobile/android/base/resources/drawable-xhdpi/network_error.png rename : mobile/android/search/res/drawable-xhdpi/search_clear.png => mobile/android/base/resources/drawable-xhdpi/search_clear.png rename : mobile/android/search/res/drawable-xhdpi/search_fox.png => mobile/android/base/resources/drawable-xhdpi/search_fox.png rename : mobile/android/search/res/drawable-xhdpi/search_history.png => mobile/android/base/resources/drawable-xhdpi/search_history.png rename : mobile/android/search/res/drawable-xhdpi/search_icon_active.png => mobile/android/base/resources/drawable-xhdpi/search_icon_active.png rename : mobile/android/search/res/drawable-xhdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png rename : mobile/android/search/res/drawable-xhdpi/search_launcher.png => mobile/android/base/resources/drawable-xhdpi/search_launcher.png rename : mobile/android/search/res/drawable-xhdpi/search_plus.png => mobile/android/base/resources/drawable-xhdpi/search_plus.png rename : mobile/android/search/res/drawable-xhdpi/widget_bg.9.png => mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png rename : mobile/android/search/res/drawable-xxhdpi/ic_action_settings.png => mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png rename : mobile/android/search/res/drawable-xxhdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png rename : mobile/android/search/res/drawable-xxhdpi/ic_widget_search.png => mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png rename : mobile/android/search/res/drawable-xxhdpi/network_error.png => mobile/android/base/resources/drawable-xxhdpi/network_error.png rename : mobile/android/search/res/drawable-xxhdpi/search_clear.png => mobile/android/base/resources/drawable-xxhdpi/search_clear.png rename : mobile/android/search/res/drawable-xxhdpi/search_fox.png => mobile/android/base/resources/drawable-xxhdpi/search_fox.png rename : mobile/android/search/res/drawable-xxhdpi/search_history.png => mobile/android/base/resources/drawable-xxhdpi/search_history.png rename : mobile/android/search/res/drawable-xxhdpi/search_icon_active.png => mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png rename : mobile/android/search/res/drawable-xxhdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png rename : mobile/android/search/res/drawable-xxhdpi/search_launcher.png => mobile/android/base/resources/drawable-xxhdpi/search_launcher.png rename : mobile/android/search/res/drawable-xxhdpi/search_plus.png => mobile/android/base/resources/drawable-xxhdpi/search_plus.png rename : mobile/android/search/res/drawable-xxxhdpi/search_launcher.png => mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png rename : mobile/android/search/res/drawable/edit_text_default.xml => mobile/android/base/resources/drawable/edit_text_default.xml rename : mobile/android/search/res/drawable/edit_text_focused.xml => mobile/android/base/resources/drawable/edit_text_focused.xml rename : mobile/android/search/res/drawable/facet_button_background.xml => mobile/android/base/resources/drawable/facet_button_background.xml rename : mobile/android/search/res/drawable/facet_button_background_default.xml => mobile/android/base/resources/drawable/facet_button_background_default.xml rename : mobile/android/search/res/drawable/facet_button_background_pressed.xml => mobile/android/base/resources/drawable/facet_button_background_pressed.xml rename : mobile/android/search/res/drawable/progressbar.xml => mobile/android/base/resources/drawable/progressbar.xml rename : mobile/android/search/res/drawable/search_row_background.xml => mobile/android/base/resources/drawable/search_row_background.xml rename : mobile/android/search/res/drawable/widget_button_left.xml => mobile/android/base/resources/drawable/widget_button_left.xml rename : mobile/android/search/res/drawable/widget_button_left_default.xml => mobile/android/base/resources/drawable/widget_button_left_default.xml rename : mobile/android/search/res/drawable/widget_button_left_pressed.xml => mobile/android/base/resources/drawable/widget_button_left_pressed.xml rename : mobile/android/search/res/drawable/widget_button_middle.xml => mobile/android/base/resources/drawable/widget_button_middle.xml rename : mobile/android/search/res/drawable/widget_button_middle_pressed.xml => mobile/android/base/resources/drawable/widget_button_middle_pressed.xml rename : mobile/android/search/res/drawable/widget_button_right.xml => mobile/android/base/resources/drawable/widget_button_right.xml rename : mobile/android/search/res/drawable/widget_button_right_pressed.xml => mobile/android/base/resources/drawable/widget_button_right_pressed.xml rename : mobile/android/search/res/layout/keyguard_widget.xml => mobile/android/base/resources/layout/keyguard_widget.xml rename : mobile/android/search/res/layout/search_activity_main.xml => mobile/android/base/resources/layout/search_activity_main.xml rename : mobile/android/search/res/layout/search_bar.xml => mobile/android/base/resources/layout/search_bar.xml rename : mobile/android/search/res/layout/search_empty.xml => mobile/android/base/resources/layout/search_empty.xml rename : mobile/android/search/res/layout/search_fragment_post_search.xml => mobile/android/base/resources/layout/search_fragment_post_search.xml rename : mobile/android/search/res/layout/search_fragment_pre_search.xml => mobile/android/base/resources/layout/search_fragment_pre_search.xml rename : mobile/android/search/res/layout/search_history_row.xml => mobile/android/base/resources/layout/search_history_row.xml rename : mobile/android/search/res/layout/search_sugestions.xml => mobile/android/base/resources/layout/search_sugestions.xml rename : mobile/android/search/res/layout/search_suggestions_row.xml => mobile/android/base/resources/layout/search_suggestions_row.xml rename : mobile/android/search/res/layout/search_widget.xml => mobile/android/base/resources/layout/search_widget.xml rename : mobile/android/search/res/values-v13/search_styles.xml => mobile/android/base/resources/values-v13/search_styles.xml rename : mobile/android/search/res/values-v16/search_styles.xml => mobile/android/base/resources/values-v16/search_styles.xml rename : mobile/android/search/res/values/search_attrs.xml => mobile/android/base/resources/values/search_attrs.xml rename : mobile/android/search/res/values/search_colors.xml => mobile/android/base/resources/values/search_colors.xml rename : mobile/android/search/res/values/search_dimens.xml => mobile/android/base/resources/values/search_dimens.xml rename : mobile/android/search/res/values/search_styles.xml => mobile/android/base/resources/values/search_styles.xml rename : mobile/android/search/res/xml/search_preferences.xml => mobile/android/base/resources/xml/search_preferences.xml rename : mobile/android/search/res/xml/search_widget_info.xml => mobile/android/base/resources/xml/search_widget_info.xml
66 lines
2.5 KiB
XML
66 lines
2.5 KiB
XML
<!-- 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/. -->
|
|
|
|
<merge
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
tools:context=".SearchActivity">
|
|
|
|
<org.mozilla.search.autocomplete.SearchBar
|
|
android:id="@+id/search_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="@dimen/search_bar_height"
|
|
android:paddingTop="@dimen/search_bar_padding_y"
|
|
android:paddingBottom="@dimen/search_bar_padding_y"
|
|
android:paddingLeft="@dimen/search_row_padding"
|
|
android:paddingRight="@dimen/search_row_padding"
|
|
android:layout_gravity="top"/>
|
|
|
|
<fragment
|
|
android:id="@+id/postsearch"
|
|
android:name="org.mozilla.search.PostSearchFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginTop="@dimen/search_bar_height"
|
|
android:layout_gravity="top"
|
|
android:visibility="invisible"/>
|
|
|
|
<fragment
|
|
android:id="@+id/presearch"
|
|
android:name="org.mozilla.search.PreSearchFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginTop="@dimen/search_bar_height"
|
|
android:layout_gravity="top"/>
|
|
|
|
<fragment
|
|
android:id="@+id/suggestions"
|
|
android:name="org.mozilla.search.autocomplete.SuggestionsFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginTop="@dimen/search_bar_height"
|
|
android:layout_gravity="top"/>
|
|
|
|
|
|
<ImageButton
|
|
android:id="@+id/settings_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:background="@android:color/transparent"
|
|
android:padding="15dp"
|
|
android:src="@drawable/ic_action_settings"
|
|
android:layout_gravity="bottom|right"
|
|
android:contentDescription="@string/search_pref_button_content_description"/>
|
|
|
|
<View
|
|
android:id="@+id/animation_card"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginTop="@dimen/search_bar_height"
|
|
android:background="@color/row_background"
|
|
android:visibility="invisible"
|
|
android:layout_gravity="top"/>
|
|
|
|
</merge>
|