Fix bugs in Setting screen & add a way to exit without saving

This commit is contained in:
sigmabeta committed 2016-01-24 19:31:34 -05:00
1 parent cf7f5d078b
commit fb04622039
17 files changed
+150 -7

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 601 B

@@ -11,5 +11,5 @@
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
tools:listitem="@layout/grid_card_game"/>
tools:listitem="@layout/card_game"/>
</FrameLayout>
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- TODO Please give me an icon! -->
<item
android:id="@+id/menu_up_one_level"
android:title="@string/add_directory_up_one_level"
android:showAsAction="ifRoom|withText"/>
app:showAsAction="ifRoom|withText"/>
</menu>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_exit_no_save"
android:title="@string/preferences_exit_no_save"
android:icon="@drawable/ic_cancel"
app:showAsAction="ifRoom"/>
</menu>
@@ -327,6 +327,7 @@
<string name="add_directory_empty_folder">That folder is empty.</string>
<!-- Preferences Screen -->
<string name="preferences_exit_no_save">Exit Without Saving</string>
<string name="preferences_cpu">CPU Settings</string>
<string name="preferences_input">Input Settings</string>
<string name="preferences_extensions">Extension Bindings</string>