<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_framelayout"
android:layout_height="match_parent"
<!-- The theme has to be defined here because the activity uses a `NoActionBar` theme. -->
<com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/appbar_layout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/PrivacyBrowserAppBarLight" >
android:id="@+id/toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android.support.design:layout_scrollFlags="scroll|enterAlways|snap" />
-
- <LinearLayout
- android:id="@+id/tabs_linearlayout"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal"
- android.support.design:layout_scrollFlags="scroll|enterAlways|snap" >
-
- <com.google.android.material.tabs.TabLayout
- android:id="@+id/tablayout"
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android.support.design:tabIndicatorGravity="top"
- android.support.design:tabMode="scrollable" />
-
- <ImageView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingStart="10dp"
- android:paddingEnd="10dp"
- android:src="@drawable/add_light"
- android:tint="?attr/addTabIconTintColor"
- android:onClick="addTab"
- android:contentDescription="@string/add_tab" />
- </LinearLayout>
+ app:layout_scrollFlags="scroll|enterAlways|snap" />
<!-- The find on page linear layout. It is initially `visibility="gone"`. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
- android:visibility="gone" >
+ android:visibility="gone"
+ app:layout_scrollFlags="scroll|enterAlways|snap" >
<!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
<EditText
android:contentDescription="@string/close"
android:onClick="closeFindOnPage" />
</LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/tabs_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:orientation="horizontal"
+ app:layout_scrollFlags="scroll|enterAlways|snap" >
+
+ <ImageView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:src="@drawable/close_light"
+ android:tint="?attr/addTabIconTintColor"
+ android:onClick="closeTab"
+ android:contentDescription="@string/close_tab" />
+
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tablayout"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ app:tabIndicatorGravity="top"
+ app:tabMode="scrollable" />
+
+ <ImageView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:src="@drawable/add_light"
+ android:tint="?attr/addTabIconTintColor"
+ android:onClick="addTab"
+ android:contentDescription="@string/add_tab" />
+ </LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
<!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->
android:id="@+id/swiperefreshlayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android.support.design:layout_behavior="@string/appbar_scrolling_view_behavior" >
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" >
- <androidx.viewpager.widget.ViewPager
+ <com.stoutner.privacybrowser.views.NoSwipeViewPager
android:id="@+id/webviewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:layout_gravity="start"
- android.support.design:headerLayout="@layout/navigation_header"
- android.support.design:menu="@menu/webview_navigation_menu"
- android.support.design:itemIconTint="?attr/navigationIconTintColor" />
+ app:headerLayout="@layout/navigation_header"
+ app:menu="@menu/webview_navigation_menu"
+ app:itemIconTint="?attr/navigationIconTintColor" />
<!-- Include the bookmarks drawer, which varies based on screen width. -->
<include layout="@layout/bookmarks_drawer" />