From 1b991ba432b9a3acb42fe0364b74a41281eb4440 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 16 Oct 2014 21:05:46 -0700
Subject: [PATCH] More layout and manifest fixes. Notably, moving most
 hardcoded strings to strings.xml

---
 AndroidManifest.xml                           |  1 -
 gen/com/limelight/R.java                      | 28 +++++++++++++++++-
 lint.xml                                      |  2 ++
 res/layout-land/activity_pc_view.xml          |  6 ++--
 res/layout-port/activity_pc_view.xml          |  6 ++--
 res/layout/activity_add_computer_manually.xml |  4 +--
 res/layout/activity_advanced_settings.xml     |  8 ++---
 res/layout/activity_app_view.xml              |  3 +-
 res/layout/activity_stream_settings.xml       | 19 ++++++------
 res/values/strings.xml                        | 29 +++++++++++++++++--
 10 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e37bee1..08718710 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -82,7 +82,6 @@
             android:name="com.limelight.Game"
             android:screenOrientation="sensorLandscape"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-            android:label="@string/title_activity_game"
             android:theme="@style/FullscreenTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/gen/com/limelight/R.java b/gen/com/limelight/R.java
index 595aa2c0..6ee98574 100644
--- a/gen/com/limelight/R.java
+++ b/gen/com/limelight/R.java
@@ -73,8 +73,34 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int simplerow=0x7f030006;
     }
     public static final class string {
+        /**  General strings 
+         */
         public static final int app_name=0x7f050000;
-        public static final int title_activity_game=0x7f050001;
+        /**  Add computer manually activity 
+         */
+        public static final int button_add_pc=0x7f050005;
+        public static final int button_add_pc_manually=0x7f050004;
+        public static final int button_advanced_settings=0x7f050007;
+        public static final int button_stream_settings=0x7f050003;
+        public static final int check_disableToasts=0x7f05000e;
+        public static final int check_enableSops=0x7f05000d;
+        public static final int check_stretchToFill=0x7f05000c;
+        public static final int ip_hint=0x7f050001;
+        public static final int radio_1080p30=0x7f05000a;
+        public static final int radio_1080p60=0x7f05000b;
+        public static final int radio_720p30=0x7f050008;
+        public static final int radio_720p60=0x7f050009;
+        public static final int radio_autoSelect=0x7f050010;
+        public static final int radio_forceHardware=0x7f050011;
+        /**  Advanced settings activity 
+         */
+        public static final int radio_forceSoftware=0x7f05000f;
+        /**  PC view activity 
+         */
+        public static final int title_pc_view=0x7f050002;
+        /**  Stream settings activity 
+         */
+        public static final int title_streaming_settings=0x7f050006;
     }
     public static final class style {
         /** 
diff --git a/lint.xml b/lint.xml
index 3de1a627..0595b6ba 100644
--- a/lint.xml
+++ b/lint.xml
@@ -8,6 +8,8 @@
     </issue>
     <issue id="InvalidPackage">
         <ignore path="libs/bcprov-jdk15on-150.jar" />
+        <ignore path="libs/bcprov-jdk15on-151.jar" />
+        <ignore path="libs/jcodec-0.1.5.jar" />
     </issue>
     <issue id="UnusedResources">
         <ignore path="res/drawable-xhdpi/ouya_icon.png" />
diff --git a/res/layout-land/activity_pc_view.xml b/res/layout-land/activity_pc_view.xml
index e1aa5b60..8c7b4df4 100644
--- a/res/layout-land/activity_pc_view.xml
+++ b/res/layout-land/activity_pc_view.xml
@@ -30,7 +30,7 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_centerHorizontal="true"
         android:layout_alignBaseline="@+id/settingsButton"
-        android:text="PC List" />
+        android:text="@string/title_pc_view" />
 
     <Button
         android:id="@+id/settingsButton"
@@ -40,7 +40,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="15dp"
-        android:text="Streaming Settings" />
+        android:text="@string/button_stream_settings" />
     
     <Button
         android:id="@+id/manuallyAddPc"
@@ -50,6 +50,6 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="15dp"
-        android:text="Add PC Manually" />
+        android:text="@string/button_add_pc_manually" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-port/activity_pc_view.xml b/res/layout-port/activity_pc_view.xml
index 486973d6..e1f0d415 100644
--- a/res/layout-port/activity_pc_view.xml
+++ b/res/layout-port/activity_pc_view.xml
@@ -32,7 +32,7 @@
         android:layout_below="@+id/manuallyAddPc"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
-        android:text="PC List" />
+        android:text="@string/title_pc_view" />
 
     <Button
         android:id="@+id/settingsButton"
@@ -40,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignParentTop="true"
-        android:text="Streaming Settings" />
+        android:text="@string/button_stream_settings" />
     
     <Button
         android:id="@+id/manuallyAddPc"
@@ -48,6 +48,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/settingsButton"
         android:layout_centerHorizontal="true"
-        android:text="Add PC Manually" />
+        android:text="@string/button_add_pc_manually" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_add_computer_manually.xml b/res/layout/activity_add_computer_manually.xml
index 645b461f..8a81268c 100644
--- a/res/layout/activity_add_computer_manually.xml
+++ b/res/layout/activity_add_computer_manually.xml
@@ -18,7 +18,7 @@
         android:ems="10"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
-        android:hint="IP address of GeForce PC" >
+        android:hint="@string/ip_hint" >
         
         <requestFocus />
     </EditText>
@@ -29,6 +29,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/hostTextView"
         android:layout_centerHorizontal="true"
-        android:text="Manually Add PC" />
+        android:text="@string/button_add_pc" />
 	
 </RelativeLayout>
diff --git a/res/layout/activity_advanced_settings.xml b/res/layout/activity_advanced_settings.xml
index bd126ce7..eddc0515 100644
--- a/res/layout/activity_advanced_settings.xml
+++ b/res/layout/activity_advanced_settings.xml
@@ -21,7 +21,7 @@
 	        android:layout_alignParentTop="true"
 	        android:paddingTop="0dp"
 	        android:paddingBottom="10dp"
-	        android:text="Advanced Settings" />
+	        android:text="@string/button_advanced_settings" />
 
         <RadioGroup
             android:id="@+id/decoderConfigGroup"
@@ -37,19 +37,19 @@
                 android:id="@+id/softwareDec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Force Software Decoding" />
+                android:text="@string/radio_forceSoftware" />
 
             <RadioButton
                 android:id="@+id/autoDec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Auto-select Decoder (Recommended)" />
+                android:text="@string/radio_autoSelect" />
 
             <RadioButton
                 android:id="@+id/hardwareDec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Force Hardware Decoding" />
+                android:text="@string/radio_forceHardware" />
         </RadioGroup>
 
         <TextView
diff --git a/res/layout/activity_app_view.xml b/res/layout/activity_app_view.xml
index 4380fab4..93ba5a74 100644
--- a/res/layout/activity_app_view.xml
+++ b/res/layout/activity_app_view.xml
@@ -30,7 +30,6 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_alignParentTop="true"
         android:paddingTop="0dp"
-        android:paddingBottom="10dp"
-        android:text="Applications" />
+        android:paddingBottom="10dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_stream_settings.xml b/res/layout/activity_stream_settings.xml
index 2f9f7bee..33dde4da 100644
--- a/res/layout/activity_stream_settings.xml
+++ b/res/layout/activity_stream_settings.xml
@@ -21,7 +21,7 @@
 	        android:layout_alignParentTop="true"
 	        android:paddingTop="0dp"
 	        android:paddingBottom="10dp"
-	        android:text="Streaming Settings" />
+	        android:text="@string/title_streaming_settings" />
         
         <RadioGroup
             android:id="@+id/streamConfigGroup"
@@ -37,28 +37,28 @@
                 android:id="@+id/config720p30Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="720p 30 FPS (Only recommended for poor devices or networks)" />
+                android:text="@string/radio_720p30" />
 
             <RadioButton
                 android:id="@+id/config720p60Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="7dp"
-                android:text="720p 60 FPS (Recommended for most devices and networks)" />
+                android:text="@string/radio_720p60" />
 
             <RadioButton
                 android:id="@+id/config1080p30Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="7dp"
-                android:text="1080p 30 FPS (Recommended for most devices if 1080p streaming is desired)" />
+                android:text="@string/radio_1080p30" />
 
             <RadioButton
                 android:id="@+id/config1080p60Selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="7dp"
-                android:text="1080p 60 FPS (Requires extremely fast device and network)" />
+                android:text="@string/radio_1080p60" />
 
         </RadioGroup>
 
@@ -69,7 +69,7 @@
             android:layout_below="@+id/disableToasts"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="15dp"
-            android:text="Advanced Settings" />
+            android:text="@string/button_advanced_settings" />
 
         <CheckBox
             android:id="@+id/stretchToFill"
@@ -77,7 +77,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/streamConfigGroup"
             android:layout_marginTop="15dp"
-            android:text="Stretch video to fill screen" />
+            android:text="@string/check_stretchToFill" />
         
         <CheckBox
             android:id="@+id/enableSops"
@@ -85,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/stretchToFill"
             android:layout_marginTop="15dp"
-            android:text="Allow GFE to modify game settings for optimal streaming" />
+            android:text="@string/check_enableSops" />
         
         <CheckBox
             android:id="@+id/disableToasts"
@@ -93,8 +93,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/enableSops"
             android:layout_marginTop="15dp"
-            android:text="Disable on-screen connection warning messages" />
-
+            android:text="@string/check_disableToasts" />
     </RelativeLayout>
 	
 </ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 08656313..5fecd4f2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- General strings -->
     <string name="app_name">Limelight</string>
-    <string name="title_activity_game">Game</string>
-
+    <string name="ip_hint">IP address of GeForce PC</string>
+    
+    <!-- PC view activity -->
+    <string name="title_pc_view">PC List</string>
+    <string name="button_stream_settings">Streaming Settings</string>
+    <string name="button_add_pc_manually">Add PC Manually</string>
+    
+    <!-- Add computer manually activity -->
+    <string name="button_add_pc">Manually Add PC</string>
+    
+    <!-- Stream settings activity -->
+    <string name="title_streaming_settings">Streaming Settings</string>
+    <string name="button_advanced_settings">Advanced Settings</string>
+    <string name="radio_720p30">720p 30 FPS (Only recommended for poor devices or networks)</string>
+    <string name="radio_720p60">720p 60 FPS (Recommended for most devices and networks)</string>
+    <string name="radio_1080p30">1080p 30 FPS (Recommended for most devices if 1080p streaming is desired)</string>
+    <string name="radio_1080p60">1080p 60 FPS (Requires extremely fast device and network)</string>
+    <string name="check_stretchToFill">Stretch video to fill screen</string>
+    <string name="check_enableSops">Allow GFE to modify game settings for optimal streaming</string>
+    <string name="check_disableToasts">Disable on-screen connection warning messages"</string>
+    
+    <!-- Advanced settings activity -->
+    <string name="radio_forceSoftware">Force Software Decoding</string>
+    <string name="radio_autoSelect">Auto-select Decoder (Recommended)</string>
+    <string name="radio_forceHardware">Force Hardware Decoding</string>
+    
 </resources>