ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop relying on a bug to maintain popup view width 

The original view was held in place due to an Android bug that began
around ICS, which did not stretch views beyond a set amount when
displayed in modal dialogs.

Clean up the layout to better fit the popup items
This commit is contained in:
TwistedUmbrella 2015-01-05 14:44:34 -05:00
parent b3de233e55
commit 96a274caaf
7 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell/android/AndroidManifest.xml
View File

@ -2,6 +2,13 @@
package="com.reicast.emulator"
android:versionCode="7"
android:versionName="r7" >
<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:smallScreens="true"
android:xlargeScreens="true" />
<uses-sdk
android:minSdkVersion="8"

5
shell/android/res/drawable/rounded.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#BBDDDDDD"/>
<corners android:radius="20dip"/>
</shape>

6
shell/android/res/layout/drawer_menu.xml
View File

@ -47,7 +47,7 @@
android:id="@+id/settings_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="26dp"
android:layout_marginLeft="32dp"
android:layout_marginTop="10dp"
android:background="@drawable/game_selector"
android:focusable="true"
@ -109,7 +109,7 @@
android:id="@+id/about_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="26dp"
android:layout_marginLeft="32dp"
android:layout_marginTop="10dp"
android:background="@drawable/game_selector"
android:focusable="true"
@ -170,7 +170,7 @@
android:id="@+id/cloud_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="26dp"
android:layout_marginLeft="32dp"
android:layout_marginTop="10dp"
android:background="@drawable/game_selector"
android:focusable="true"

28
shell/android/res/layout/menu_popup_config.xml
View File

@ -2,22 +2,23 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/menuConfig"
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:gravity="center_horizontal"
android:orientation="vertical" >
<TableLayout
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:background="@android:color/transparent"
android:stretchColumns="*" >
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -25,6 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_back" />
</TableRow>
@ -32,8 +34,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -41,6 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_widescreen" />
</TableRow>
@ -48,8 +51,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -57,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_frames_down" />
</TableRow>
@ -64,8 +68,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -73,6 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_frames_up" />
</TableRow>
@ -80,8 +85,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -89,6 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_frame_limit" />
</TableRow>
@ -96,8 +102,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -105,6 +111,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_audio" />
</TableRow>
@ -112,8 +119,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -121,6 +128,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_turbo" />
</TableRow>

22
shell/android/res/layout/menu_popup_debug.xml
View File

@ -2,22 +2,23 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/menuDebug"
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:gravity="center_horizontal"
android:orientation="vertical" >
<TableLayout
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:background="@android:color/transparent"
android:stretchColumns="*" >
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -25,6 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_back" />
</TableRow>
@ -32,8 +34,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -41,6 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_clear_cache" />
</TableRow>
@ -48,8 +51,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -57,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_profiler_one" />
</TableRow>
@ -64,8 +68,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -73,6 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_profiler_two" />
</TableRow>
@ -80,8 +85,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -89,6 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_print_stats" />
</TableRow>

27
shell/android/res/layout/menu_popup_main.xml
View File

@ -2,22 +2,23 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/menuMain"
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:gravity="center_horizontal"
android:orientation="vertical" >
<TableLayout
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:background="@android:color/transparent"
android:stretchColumns="*" >
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<LinearLayout
@ -30,8 +31,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -39,6 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_disk" />
</TableRow>
@ -46,8 +48,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -55,6 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_vmu_swap" />
</TableRow>
@ -62,8 +65,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -71,6 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_options" />
</TableRow>
@ -78,8 +82,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -87,6 +91,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_debugging" />
</TableRow>
@ -94,8 +99,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -103,6 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_screenshot" />
</TableRow>
@ -110,8 +116,8 @@
<TableRow
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:background="#66000000"
android:gravity="center" >
<Button
@ -119,6 +125,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/rounded"
android:ems="8"
android:text="@string/popup_button_exit" />
</TableRow>

2
shell/android/res/values/strings.xml
View File

@ -101,7 +101,7 @@
<string name="input">Input</string>
<string name="about">About</string>
<string name="rateme">Rate Me</string>
<string name="messages">Test Suite</string>
<string name="messages">Send Logs</string>
<string name="cloud">Cloud VMU</string>
<string name="textOn">ON</string>