Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay ...

Conflicts:
	Source/Android/res/values-ja/strings.xml
	Source/Android/res/values/strings.xml
	Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
	Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
	Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java

2013-11-24 16:12:00 -06:00

..

about_layout.xml

[Android] Slightly change the layout of the AboutFragment. Looks more like an actual list view now.

2013-09-16 22:04:59 -04:00

emulation_view.xml

[Android] Slight cleanup for previous commit. Mostly UI adjustments.

2013-10-25 17:39:23 -04:00

gamelist_activity.xml

[Android] Make the navigation drawer not so blindingly dark.

2013-06-26 04:58:34 -05:00

gamelist_folderbrowser_list_item.xml

[Android] Change the name of the XML layout file gamelist_folderbrowser_list.xml to gamelist_folderbrowser_list_item.xml. More accurate name on what it is.

2013-11-16 03:31:02 -05:00

gamelist_listview.xml

[Android] Simplify the line divider for the folder browser and game list. Turns out someone disabled it in the list view initially. No more custom implementation now.

2013-08-29 12:06:31 -04:00

input_overlay_config_layout.xml

[Android] Fix alignment issues with the overlay config settings.

2013-10-25 21:29:06 -04:00

prefs_viewpager.xml

[Android] Remove unnecessary attributes from the ViewPager layout XML file.

2013-10-06 20:04:53 -04:00

sidemenu.xml

[Android] Turns out the sidebar XML could also be simplified.

2013-08-22 07:02:30 -04:00