piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Collapse layouts with a framelayout root then another viewgroup.

Browse Source 
There's no point to this, and it just slow things down (technically).
This commit is contained in:
Mike Harris
2017-10-07 23:12:08 -07:00
parent 4cab718065
commit c4d7814afa
2 changed files with 52 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
View File

@ -1,15 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <SurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:id="@+id/surface_emulation"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:layout_width="match_parent"
tools:context="org.dolphinemu.dolphinemu.fragments.EmulationFragment"> android:focusable="false"
android:focusableInTouchMode="false"
<!-- This is what everything is rendered to during emulation --> />
<SurfaceView
android:id="@+id/surface_emulation"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:focusable="false"
android:focusableInTouchMode="false"/>
</FrameLayout>

98
Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
View File

@ -1,60 +1,52 @@
<?xml version="1.0" encoding="utf-8"?> <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid_state_slots"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="#af000000" android:columnCount="3"
android:orientation="vertical"> android:rowCount="2"
android:layout_gravity="center"
android:background="#af000000">
<GridLayout <Button
android:id="@+id/grid_state_slots" android:id="@+id/loadsave_state_button_1"
android:layout_width="wrap_content" android:layout_width="128dp"
android:layout_height="wrap_content" android:layout_height="128dp"
android:columnCount="3" android:text="@string/emulation_slot1"
android:rowCount="2" style="@style/OverlayInGameMenuOption"/>
android:layout_gravity="center">
<Button <Button
android:id="@+id/loadsave_state_button_1" android:id="@+id/loadsave_state_button_2"
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="128dp" android:layout_height="128dp"
android:text="@string/emulation_slot1" android:text="@string/emulation_slot2"
style="@style/OverlayInGameMenuOption"/> style="@style/OverlayInGameMenuOption"/>
<Button <Button
android:id="@+id/loadsave_state_button_2" android:id="@+id/loadsave_state_button_3"
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="128dp" android:layout_height="128dp"
android:text="@string/emulation_slot2" android:text="@string/emulation_slot3"
style="@style/OverlayInGameMenuOption"/> style="@style/OverlayInGameMenuOption"/>
<Button <Button
android:id="@+id/loadsave_state_button_3" android:id="@+id/loadsave_state_button_4"
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="128dp" android:layout_height="128dp"
android:text="@string/emulation_slot3" android:text="@string/emulation_slot4"
style="@style/OverlayInGameMenuOption"/> style="@style/OverlayInGameMenuOption"/>
<Button <Button
android:id="@+id/loadsave_state_button_4" android:id="@+id/loadsave_state_button_5"
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="128dp" android:layout_height="128dp"
android:text="@string/emulation_slot4" android:text="@string/emulation_slot5"
style="@style/OverlayInGameMenuOption"/> style="@style/OverlayInGameMenuOption"/>
<Button <Button
android:id="@+id/loadsave_state_button_5" android:id="@+id/loadsave_state_button_6"
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="128dp" android:layout_height="128dp"
android:text="@string/emulation_slot5" android:text="@string/emulation_slot6"
style="@style/OverlayInGameMenuOption"/> style="@style/OverlayInGameMenuOption"/>
<Button </GridLayout>
android:id="@+id/loadsave_state_button_6"
android:layout_width="128dp"
android:layout_height="128dp"
android:text="@string/emulation_slot6"
style="@style/OverlayInGameMenuOption"/>
</GridLayout>
</FrameLayout>