From 0c5f3953dd0f327271ca379e721eae25f8c32dd4 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 22 Aug 2013 06:58:19 -0400
Subject: [PATCH] [Android] Simplify the XML layout for the about menu. Remove
 unused strings.

---
 Source/Android/res/layout/about_layout.xml | 37 +++++++++-------------
 Source/Android/res/values-ja/strings.xml   |  5 +--
 Source/Android/res/values/dimens.xml       |  7 ----
 Source/Android/res/values/strings.xml      |  3 --
 4 files changed, 16 insertions(+), 36 deletions(-)
 delete mode 100644 Source/Android/res/values/dimens.xml

diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/res/layout/about_layout.xml
index 7189fd7ce5..c282fc0369 100644
--- a/Source/Android/res/layout/about_layout.xml
+++ b/Source/Android/res/layout/about_layout.xml
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical" >
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
 
-            <TextView
-                android:id="@+id/FolderTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dip"
-                android:layout_marginTop="5dip"
-                android:singleLine="true"
-                android:text="Title"
-                android:textStyle="bold" />
+    <TextView
+        android:id="@+id/FolderTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dip"
+        android:layout_marginTop="5dip"
+        android:singleLine="true"
+        android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/FolderSubTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:text="Subtitle" />
+    <TextView
+        android:id="@+id/FolderSubTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dip" />
 
-        </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index 3b6d6c56f5..9216a2ecdc 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -50,10 +50,7 @@
     <string name="c_stick_right">C-スティック: →</string>
     <string name="trigger_left">左のトリガー</string>
     <string name="trigger_right">右のトリガー</string>
-    
-    <string name="not_drawing_onscreen_controls">コントロールは画面上に描画されていない</string>
-    <string name="drawing_onscreen_controls">コントロールは画面上に描画されています</string>
-    <string name="press_button_to_config">%1$sを設定するにはボタンを押して</string>   
+    <string name="press_button_to_config">%1$sを設定するにはボタンを押して</string>
     
     <!-- Prefs Fragment -->
     <string name="interpreter">Interpreter</string>
diff --git a/Source/Android/res/values/dimens.xml b/Source/Android/res/values/dimens.xml
deleted file mode 100644
index 55c1e5908c..0000000000
--- a/Source/Android/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-</resources>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 01883fabd1..50bacda5df 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -50,8 +50,6 @@
     <string name="c_stick_right">C Stick Right</string>
     <string name="trigger_left">Trigger L</string>
     <string name="trigger_right">Trigger R</string>
-    <string name="not_drawing_onscreen_controls">Not drawing on-screen controls</string>
-    <string name="drawing_onscreen_controls">Drawing on-screen controls</string>
     <string name="press_button_to_config">Press button to configure %1$s</string>
 
     <!-- Preference Related -->
@@ -93,7 +91,6 @@
     <string name="ignore_format_changes_descrip">Ignore any changes to the EFB format.</string>
     <string name="efb_copy_method">EFB Copy Method</string>
     <string name="efb_copy_method_descrip">Determines how EFB copies will be emulated.</string>
-    <string name="efb_copy_off">Off</string>
     <string name="efb_copy_texture">Texture</string>
     <string name="efb_copy_ram_uncached">RAM (uncached)</string>
     <string name="efb_copy_ram_cached">RAM (cached)</string>