Android: Add Settings Activity to new UI.

This commit is contained in:
Eder Bastos committed 2015-05-15 10:45:00 -04:00
1 parent bb7f8c6753
commit ba591ea1ee
16 files changed
+1111 -10

No files matched your search

@@ -2,7 +2,7 @@
<!-- All lists for ListPreference keys/values are placed here -->
<resources>
<!-- CPU core selection - X86_64 -->
<string-array name="emuCoreEntriesX86_64" translatable="false">
<item>@string/interpreter</item>
@@ -42,7 +42,14 @@
<string-array name="emuCoreValuesOther" translatable="false">
<item>0</item>
</string-array>
<!-- New UI CPU Core selection - Default -->
<string-array name="string_emu_cores" translatable="false">
<item>@string/interpreter</item>
</string-array>
<string-array name="int_emu_cores" translatable="false">
<item>0</item>
</string-array>
<!-- Video Backend Selection - Supports OpenGL ES 3 -->
<string-array name="videoBackendEntriesGLES3" translatable="false">
@@ -223,7 +223,17 @@
<!-- New UI Strings -->
<string name="title_new_ui">Dolphin New UI</string>
<!-- Game Grid Screen-->
<string name="grid_menu_settings">Settings</string>
<!-- Add Directory Screen-->
<string name="add_directory_title">Add Folder to Library</string>
<string name="add_directory_up_one_level">Up one level</string>
<string name="add_directory_empty_folder">That folder is empty.</string>
<!-- Preferences Screen -->
<string name="preferences_cpu">CPU Settings</string>
<string name="preferences_input">Input Settings</string>
<string name="preferences_video">Video Settings</string>
</resources>
@@ -9,6 +9,12 @@
<item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
</style>
<!-- Same as above, but use default action bar, and mandate margins. -->
<style name="DolphinSettingsBase" parent="android:Theme.Material.Light.DarkActionBar">
<item name="android:colorPrimary">@color/dolphin_blue</item>
<item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
</style>
<!-- Inherit from the Base Dolphin Theme-->
<style name="DolphinWii" parent="DolphinBase">
<!-- theme UI controls like checkboxes and text fields -->
@@ -24,4 +30,20 @@
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
</style>
<!-- Inherit from the Base Dolphin Settings Theme-->
<style name="DolphinSettingsWii" parent="DolphinSettingsBase">
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_wii</item>
</style>
<style name="DolphinSettingsGamecube" parent="DolphinSettingsBase">
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
</style>
<style name="DolphinSettingsWiiware" parent="DolphinSettingsBase">
<!-- theme UI controls like checkboxes and text fields -->
<item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
</style>
</resources>