mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 11:15:34 +00:00
Bug 1366671
- Part 1: Duplicate empty screen resoueces for Photon. r=walkingice
MozReview-Commit-ID: FkkDIQ85Qxp --HG-- rename : mobile/android/app/src/main/res/layout/preference_search_tip.xml => mobile/android/app/src/australis/res/layout/preference_search_tip.xml rename : mobile/android/app/src/main/res/layout/private_tabs_panel.xml => mobile/android/app/src/australis/res/layout/private_tabs_panel.xml extra : rebase_source : 4b4b981c5e6fa541ac3d32241dac33a242cd2e93
This commit is contained in:
parent
173bb41353
commit
c443b3b27e
@ -0,0 +1,34 @@
|
||||
<?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/. -->
|
||||
|
||||
<!-- Ignore UseCompoundDrawables because they caused a regression in bug 1208790. -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:ignore="UseCompoundDrawables"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingRight="?android:attr/scrollbarSize">
|
||||
|
||||
<TextView android:id="@+id/label_search_hint"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:text="@string/pref_search_hint"
|
||||
android:layout_marginTop="5dip"
|
||||
android:layout_marginBottom="6dip"
|
||||
android:layout_marginLeft="15dip"
|
||||
android:layout_marginRight="6dip"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingRight="6dip"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<ImageView android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:paddingRight="8dp"
|
||||
android:paddingTop="12dip"
|
||||
android:src="@drawable/tip_addsearch"/>
|
||||
|
||||
</LinearLayout>
|
@ -0,0 +1,24 @@
|
||||
<?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/. -->
|
||||
|
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<ImageView android:id="@+id/private_tabs_empty"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:src="@drawable/private_masq"
|
||||
android:layout_gravity="center"/>
|
||||
|
||||
<!-- Note: for an unknown reason, scrolling in the TabsLayout
|
||||
does not work unless it is laid out after the empty view. -->
|
||||
<view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
|
||||
android:id="@+id/private_tabs_layout"
|
||||
style="@style/TabsLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
gecko:tabs="tabs_private"/>
|
||||
|
||||
</merge>
|
Loading…
Reference in New Issue
Block a user