2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00

For #7423: remove unnecessary CoordinatorLayout in fragment_home.

Co-authored-by: Emma Malysz <emalysz@mozilla.com>
This commit is contained in:
Michael Comella 2020-01-13 16:25:22 -08:00 committed by Emma Malysz
parent d7fd8e763a
commit 91a557dc0a

View File

@ -50,11 +50,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
<<<<<<< HEAD
<<<<<<< HEAD
<View
android:id="@+id/bottom_bar"
android:layout_width="0dp"
android:layout_height="56dp"
=======
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>>>>>>> 52d4338e... For #7423: remove unnecessary CoordinatorLayout in fragment_home.
android:background="?bottomBarBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -125,4 +132,3 @@
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.motion.widget.MotionLayout>