| Index: blimp/client/app/android/java/res/layout/blimp_main.xml
|
| diff --git a/blimp/client/app/android/java/res/layout/blimp_main.xml b/blimp/client/app/android/java/res/layout/blimp_main.xml
|
| index fca99bcb70118ede090177392b28da6fd3c8859b..054d4ee66fbc289256cd9523c2e794912f7828a9 100644
|
| --- a/blimp/client/app/android/java/res/layout/blimp_main.xml
|
| +++ b/blimp/client/app/android/java/res/layout/blimp_main.xml
|
| @@ -61,17 +61,25 @@
|
| android:layout_width="match_parent"
|
| android:layout_height="match_parent"
|
| android:layout_below="@+id/toolbar"/>
|
| +
|
| + <include android:id="@+id/debug_stats"
|
| + layout="@layout/debug_stats_overlay"
|
| + android:layout_width="wrap_content"
|
| + android:layout_height="wrap_content"
|
| + android:layout_alignParentBottom="true"
|
| + android:visibility="invisible" />
|
| +
|
| <org.chromium.blimp.input.WebInputBox
|
| - android:id="@+id/editText"
|
| - android:layout_width="match_parent"
|
| - android:layout_height="wrap_content"
|
| - android:background="@drawable/web_input_background"
|
| - android:layout_alignParentBottom="true"
|
| - android:layout_marginTop="45dp"
|
| - android:padding="10dp"
|
| - android:paddingTop="16dp"
|
| - android:inputType="text|textWebEditText"
|
| - android:visibility="gone"/>
|
| + android:id="@+id/editText"
|
| + android:layout_width="match_parent"
|
| + android:layout_height="wrap_content"
|
| + android:background="@drawable/web_input_background"
|
| + android:layout_alignParentBottom="true"
|
| + android:layout_marginTop="45dp"
|
| + android:padding="10dp"
|
| + android:paddingTop="16dp"
|
| + android:inputType="text|textWebEditText"
|
| + android:visibility="gone"/>
|
|
|
| </RelativeLayout>
|
| </merge>
|
|
|