diff options
| author | 2023-09-25 20:57:06 -0400 | |
|---|---|---|
| committer | 2023-09-25 20:57:06 -0400 | |
| commit | 69ba29e518a3895e5defe55d52853ac06f329613 (patch) | |
| tree | 4aa86b57fd01d7c016e884c8cd15b8c697dd89de /src/android | |
| parent | Merge pull request #11583 from t895/overlay-fix-2 (diff) | |
| parent | android: Prevent click ripple from appearing on loading card (diff) | |
| download | yuzu-69ba29e518a3895e5defe55d52853ac06f329613.tar.gz yuzu-69ba29e518a3895e5defe55d52853ac06f329613.tar.xz yuzu-69ba29e518a3895e5defe55d52853ac06f329613.zip | |
Merge pull request #11597 from t895/drawer-fix
android: Navigation drawer lock mode fix
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/res/layout/fragment_emulation.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xml index da97d85c1..750ce094a 100644 --- a/src/android/app/src/main/res/layout/fragment_emulation.xml +++ b/src/android/app/src/main/res/layout/fragment_emulation.xml | |||
| @@ -32,7 +32,8 @@ | |||
| 32 | android:layout_width="wrap_content" | 32 | android:layout_width="wrap_content" |
| 33 | android:layout_height="wrap_content" | 33 | android:layout_height="wrap_content" |
| 34 | android:layout_gravity="center" | 34 | android:layout_gravity="center" |
| 35 | android:focusable="false"> | 35 | android:focusable="false" |
| 36 | android:clickable="false"> | ||
| 36 | 37 | ||
| 37 | <androidx.constraintlayout.widget.ConstraintLayout | 38 | <androidx.constraintlayout.widget.ConstraintLayout |
| 38 | android:id="@+id/loading_layout" | 39 | android:id="@+id/loading_layout" |
| @@ -155,7 +156,7 @@ | |||
| 155 | android:id="@+id/in_game_menu" | 156 | android:id="@+id/in_game_menu" |
| 156 | android:layout_width="wrap_content" | 157 | android:layout_width="wrap_content" |
| 157 | android:layout_height="match_parent" | 158 | android:layout_height="match_parent" |
| 158 | android:layout_gravity="start|bottom" | 159 | android:layout_gravity="start" |
| 159 | app:headerLayout="@layout/header_in_game" | 160 | app:headerLayout="@layout/header_in_game" |
| 160 | app:menu="@menu/menu_in_game" | 161 | app:menu="@menu/menu_in_game" |
| 161 | tools:visibility="gone" /> | 162 | tools:visibility="gone" /> |