diff options
Diffstat (limited to 'android/source/res/layout/activity_main.xml')
| -rw-r--r-- | android/source/res/layout/activity_main.xml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index c2528023d0f8..e503cb90f0eb 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout" +<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -8,7 +8,7 @@ android:background="#fff" tools:context=".LibreOfficeMainActivity"> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator_layout" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -18,44 +18,46 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/appBar" android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.v7.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:elevation="3dp" - android:background="@color/toolbar_background" app:theme="@style/LibreOfficeTheme.Toolbar" tools:theme="@style/LibreOfficeTheme.Toolbar" app:popupTheme="@style/LibreOfficeTheme" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:background="@color/background_floating"> <EditText android:id="@+id/calc_address" android:layout_width="@dimen/calc_address_bar_width" - android:layout_height="@dimen/calc_toolbar_height" + android:layout_height="wrap_content" android:layout_weight="0" android:inputType="textNoSuggestions" android:imeOptions="actionDone|actionGo" - android:visibility="gone"/> + android:visibility="gone" + android:importantForAutofill="no" /> <EditText android:id="@+id/calc_formula" android:layout_width="0dp" - android:layout_height="@dimen/calc_toolbar_height" + android:layout_height="wrap_content" android:layout_weight="1" android:inputType="text" android:imeOptions="actionDone|actionGo" - android:visibility="gone"/> + android:visibility="gone" + android:importantForAutofill="no" /> </LinearLayout> @@ -133,7 +135,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> <ListView android:id="@+id/left_drawer" @@ -143,4 +145,4 @@ android:background="#9FFF" android:choiceMode="singleChoice"/> -</android.support.v4.widget.DrawerLayout> +</androidx.drawerlayout.widget.DrawerLayout> |