Merge pull request #320 from SeannyM/Android-Theme

Make the Android UI more like the desktop UI

11 files changed, 15 insertions, 4 deletions

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 95d8b9a174..5525ddc02f 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -33,8 +33,13 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.dolphinemu.dolphinemu.about.AboutActivity"/>
-        <activity android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"/>
+        <activity
+            android:name="org.dolphinemu.dolphinemu.about.AboutActivity"
+            android:theme="@android:style/Theme.Holo.Light" />
+
+        <activity
+            android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
+            android:theme="@android:style/Theme.Holo.Light" />
 
         <activity
             android:name="org.dolphinemu.dolphinemu.emulation.EmulationActivity"
@@ -47,7 +52,8 @@
 
         <activity
             android:name="org.dolphinemu.dolphinemu.settings.PrefsActivity"
-            android:label="@string/settings" />
+            android:label="@string/settings"
+            android:theme="@android:style/Theme.Holo.Light" />
 
     </application>
 
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_file.png b/Source/Android/res/drawable-hdpi/ic_menu_file.png
index f204740905..c90a3b6b43 100644
--- a/Source/Android/res/drawable-hdpi/ic_menu_file.png
+++ b/Source/Android/res/drawable-hdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
index 6f441b41da..5df998b9fe 100644
--- a/Source/Android/res/drawable-hdpi/ic_menu_folder.png
+++ b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_file.png b/Source/Android/res/drawable-mdpi/ic_menu_file.png
index dee2577897..aad03cbf38 100644
--- a/Source/Android/res/drawable-mdpi/ic_menu_file.png
+++ b/Source/Android/res/drawable-mdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
index cc81e57f7e..a15687a8cd 100644
--- a/Source/Android/res/drawable-mdpi/ic_menu_folder.png
+++ b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
index 85369c338e..38e94fd104 100644
--- a/Source/Android/res/drawable-xhdpi/ic_menu_file.png
+++ b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
index 78500a93c1..653847bde9 100644
--- a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
+++ b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_menu_file.png b/Source/Android/res/drawable-xxhdpi/ic_menu_file.png
index 5b09550c00..34efa40606 100644
--- a/Source/Android/res/drawable-xxhdpi/ic_menu_file.png
+++ b/Source/Android/res/drawable-xxhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png
index 68792f0587..c0e71acba6 100644
--- a/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png
+++ b/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
index 2066f4b10b..281e9119c5 100644
--- a/Source/Android/res/layout/sidemenu.xml
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -14,6 +14,7 @@
         android:singleLine="true"
         android:text="@+id/TextView01"
         android:textAppearance="?android:attr/textAppearanceLarge" 
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        android:textColor="#FFFFFF" />
 
 </LinearLayout>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
index d4dedd29aa..c9922e1adb 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
@@ -70,6 +70,10 @@ public final class GameListAdapter extends ArrayAdapter<GameListItem>
 			}
 		}
 
+		// Make every other game in the list grey
+		if (position % 2 == 1)
+			convertView.setBackgroundColor(0xFFE3E3E3);
+
 		return convertView;
 	}
 }