Fix toolbar layout save state (#1558)
This commit is contained in:
parent
255ebe3458
commit
fd0707e4f7
|
|
@ -21,6 +21,7 @@
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/fragment_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
||||||
|
|
@ -36,6 +37,7 @@
|
||||||
app:fitsSystemWindowsInsets="@integer/internal_fragment_top_insets">
|
app:fitsSystemWindowsInsets="@integer/internal_fragment_top_insets">
|
||||||
|
|
||||||
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
||||||
|
android:id="@+id/toolbar_layout"
|
||||||
style="?attr/collapsingToolbarLayoutLargeStyle"
|
style="?attr/collapsingToolbarLayoutLargeStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
|
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
|
||||||
|
|
@ -76,8 +78,8 @@
|
||||||
android:tooltipText="@string/module_settings"
|
android:tooltipText="@string/module_settings"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:backgroundTint="?attr/colorPrimary"
|
app:backgroundTint="?attr/colorPrimary"
|
||||||
app:layout_fitsSystemWindowsInsets="@integer/internal_fragment_bottom_insets"
|
|
||||||
app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
|
app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
|
||||||
|
app:layout_fitsSystemWindowsInsets="@integer/internal_fragment_bottom_insets"
|
||||||
app:tint="?attr/colorOnPrimary" />
|
app:tint="?attr/colorOnPrimary" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/fragment_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
||||||
|
|
@ -35,6 +36,7 @@
|
||||||
app:fitsSystemWindowsInsets="@integer/internal_fragment_top_insets">
|
app:fitsSystemWindowsInsets="@integer/internal_fragment_top_insets">
|
||||||
|
|
||||||
<com.google.android.material.appbar.CollapsingToolbarLayout
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/toolbar_layout"
|
||||||
style="?collapsingToolbarLayoutLargeStyle"
|
style="?collapsingToolbarLayoutLargeStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?collapsingToolbarLayoutLargeSize"
|
android:layout_height="?collapsingToolbarLayoutLargeSize"
|
||||||
|
|
@ -51,10 +53,10 @@
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?actionBarSize"
|
android:layout_height="?actionBarSize"
|
||||||
app:titleMarginStart="@dimen/m3_alert_dialog_icon_margin"
|
|
||||||
android:elevation="0dp"
|
android:elevation="0dp"
|
||||||
app:layout_collapseMode="pin"
|
app:layout_collapseMode="pin"
|
||||||
app:logo="@drawable/ic_launcher" />
|
app:logo="@drawable/ic_launcher"
|
||||||
|
app:titleMarginStart="@dimen/m3_alert_dialog_icon_margin" />
|
||||||
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
-->
|
-->
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:id="@+id/fragment_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:animateLayoutChanges="true"
|
android:animateLayoutChanges="true"
|
||||||
|
|
@ -91,7 +92,7 @@
|
||||||
android:tooltipText="@string/add_module_to_user"
|
android:tooltipText="@string/add_module_to_user"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:backgroundTint="?attr/colorPrimary"
|
app:backgroundTint="?attr/colorPrimary"
|
||||||
app:layout_fitsSystemWindowsInsets="@integer/internal_fragment_bottom_insets"
|
|
||||||
app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
|
app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
|
||||||
|
app:layout_fitsSystemWindowsInsets="@integer/internal_fragment_bottom_insets"
|
||||||
app:tint="?attr/colorOnPrimary" />
|
app:tint="?attr/colorOnPrimary" />
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:id="@+id/fragment_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:id="@+id/fragment_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
app:consumeSystemWindowsInsets="@integer/internal_fragment_insets"
|
||||||
|
|
@ -34,6 +35,7 @@
|
||||||
app:fitsSystemWindowsInsets="@integer/internal_fragment_top_insets">
|
app:fitsSystemWindowsInsets="@integer/internal_fragment_top_insets">
|
||||||
|
|
||||||
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
||||||
|
android:id="@+id/toolbar_layout"
|
||||||
style="?attr/collapsingToolbarLayoutLargeStyle"
|
style="?attr/collapsingToolbarLayoutLargeStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
|
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue