Bug 1177244 - Move tab queue prompt to merge tag. r=mhaigh

--HG--
extra : commitid : 3tK3pF1KBZY
extra : rebase_source : b0e56ad1554a1e592e8700d9bcd60df6ea0f2da0
This commit is contained in:
Michael Comella 2015-06-24 15:24:21 -07:00
parent 1b82afe338
commit 85de455f3f

View File

@ -4,19 +4,16 @@
- 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/. -->
<!-- (lint: UselessParent) The second-outermost layout doesn't have a parent to position itself
against and would take up the whole screen without the outermost layout. -->
<FrameLayout
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tab_queue_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
tools:ignore="UselessParent">
android:clipToPadding="false">
<LinearLayout
android:id="@+id/tab_queue_container"
android:layout_width="@dimen/tab_queue_container_width"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
@ -119,5 +116,4 @@
</FrameLayout>
</LinearLayout>
</FrameLayout>
</merge>