diff options
author | Charles Lombardo <clombardo169@gmail.com> | 2023-08-30 04:20:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-30 04:20:59 +0200 |
commit | 44bce118534980a1da12ace2502408cf3d8641e2 (patch) | |
tree | 006675bed0e4a67709abba293ad5142609a41395 /src/android/app/src/main/res/layout/activity_settings.xml | |
parent | Merge pull request #11413 from t895/intents (diff) | |
parent | android: Don't reload settings when stopping settings activity (diff) | |
download | yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.gz yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.bz2 yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.lz yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.xz yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.zst yuzu-44bce118534980a1da12ace2502408cf3d8641e2.zip |
Diffstat (limited to 'src/android/app/src/main/res/layout/activity_settings.xml')
-rw-r--r-- | src/android/app/src/main/res/layout/activity_settings.xml | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/src/android/app/src/main/res/layout/activity_settings.xml b/src/android/app/src/main/res/layout/activity_settings.xml index 14ae83b04..8a026a30a 100644 --- a/src/android/app/src/main/res/layout/activity_settings.xml +++ b/src/android/app/src/main/res/layout/activity_settings.xml @@ -1,42 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.coordinatorlayout.widget.CoordinatorLayout - android:id="@+id/coordinator_main" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/constraint_settings" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/colorSurface"> - <com.google.android.material.appbar.AppBarLayout - android:id="@+id/appbar_settings" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fitsSystemWindows="true" - app:elevation="0dp"> - - <com.google.android.material.appbar.CollapsingToolbarLayout - style="?attr/collapsingToolbarLayoutMediumStyle" - android:id="@+id/toolbar_settings_layout" - android:layout_width="match_parent" - android:layout_height="?attr/collapsingToolbarLayoutMediumSize" - app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> - - <com.google.android.material.appbar.MaterialToolbar - android:id="@+id/toolbar_settings" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - app:layout_collapseMode="pin" /> - - </com.google.android.material.appbar.CollapsingToolbarLayout> - - </com.google.android.material.appbar.AppBarLayout> - - <FrameLayout - android:id="@+id/frame_content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginHorizontal="12dp" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + <androidx.fragment.app.FragmentContainerView + android:id="@+id/fragment_container" + android:name="androidx.navigation.fragment.NavHostFragment" + android:layout_width="0dp" + android:layout_height="0dp" + app:defaultNavHost="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:layout="@layout/fragment_settings" /> <View android:id="@+id/navigation_bar_shade" @@ -45,6 +27,8 @@ android:background="@android:color/transparent" android:clickable="false" android:focusable="false" - android:layout_gravity="bottom|center_horizontal" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> -</androidx.coordinatorlayout.widget.CoordinatorLayout> +</androidx.constraintlayout.widget.ConstraintLayout> |