From 23f3d684a7fdff3241978f7cc68044a7357e4cbf Mon Sep 17 00:00:00 2001
From: "burke.davey" <burke.davey@dad15e60-07c4-0504-eb71-dc8a1c21358d>
Date: Sat, 12 Feb 2011 23:46:51 +0000
Subject: [PATCH] Enable landscape

---
 android/AndroidManifest.xml                     | 14 ++++++--------
 .../apps/chrometophone/SetupActivity.java       | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 438e5bf..4ae0f4f 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.google.android.apps.chrometophone"
-      android:versionCode="11"
-      android:versionName="2.2.0">
+      android:installLocation="auto"
+      android:versionCode="12"
+      android:versionName="2.3.0">
     <!-- Only this application can receive the messages and registration result -->    
     <permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" android:protectionLevel="signature" />
     <uses-permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" />
@@ -20,8 +21,7 @@
     
     <application android:icon="@drawable/app_icon" android:label="@string/app_name">
         <activity android:name=".HistoryActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait">
+                  android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -30,13 +30,11 @@
         
         <activity android:name=".SetupActivity"
                   android:label="@string/app_name"
-                  android:launchMode="singleTop"
-                  android:screenOrientation="portrait">
+                  android:launchMode="singleTop">
         </activity>
         
         <activity android:name=".HelpActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait">
+                  android:label="@string/app_name">
         </activity>
         
         <activity android:name=".ShareLinkActivity">
diff --git a/android/src/com/google/android/apps/chrometophone/SetupActivity.java b/android/src/com/google/android/apps/chrometophone/SetupActivity.java
index afa5786..1b48b54 100644
--- a/android/src/com/google/android/apps/chrometophone/SetupActivity.java
+++ b/android/src/com/google/android/apps/chrometophone/SetupActivity.java
@@ -60,11 +60,11 @@ public class SetupActivity extends Activity {
         super.onCreate(savedInstanceState);
 
         SharedPreferences prefs = Prefs.get(this);
-        String deviceRegistrationID = prefs.getString("deviceRegistrationID", null);
-        if (deviceRegistrationID != null) {
-            setScreenContent(R.layout.connected);
-        } else {
+        int savedScreenId = prefs.getInt("savedScreenId", -1);
+        if (savedScreenId == -1) {
             setScreenContent(R.layout.intro);
+        } else {
+            setScreenContent(savedScreenId);
         }
 
         registerReceiver(mUpdateUIReceiver, new IntentFilter(UPDATE_UI_ACTION));
@@ -139,6 +139,10 @@ public class SetupActivity extends Activity {
                 break;
             }
         }
+        SharedPreferences prefs = Prefs.get(this);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putInt("savedScreenId", screenId);
+        editor.commit();
     }
 
     private void setIntroScreenContent() {
@@ -231,9 +235,14 @@ public class SetupActivity extends Activity {
             }
         });
 
+        final Context context = this;
         Button finishButton = (Button) findViewById(R.id.finish);
         finishButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
+                SharedPreferences prefs = Prefs.get(context);
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putInt("savedScreenId", R.layout.connected);
+                editor.commit();
                 finish();
             }
         });