From 04d2e60d75176ddc377417c77aff39cfce86ca66 Mon Sep 17 00:00:00 2001
From: hastarin <hastarin+github@gmail.com>
Date: Thu, 23 May 2013 20:32:52 +1000
Subject: [PATCH 1/3] This is a version of the multi window patch minus Android
 Studio changes. Proguard changes are excluded since there is no config in the
 master branch

---
 mobile/AndroidManifest.xml   | 62 +++++++++++++++++++++++++++---------
 mobile/res/values/dimens.xml |  4 +++
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index c40ad029..894d0d6f 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cradle.iitc_mobile"
-    android:versionCode="21"
-    android:versionName="0.4.0" >
+          package="com.cradle.iitc_mobile"
+          android:versionCode="21"
+          android:versionName="0.4.0">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="17"/>
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="true"
@@ -24,25 +24,57 @@
             android:name="com.cradle.iitc_mobile.IITC_Mobile"
             android:theme="@style/AppBaseTheme"
             android:label="@string/app_name"
-            android:configChanges="orientation|keyboard|keyboardHidden|screenSize" >
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
+
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:host="www.ingress.com" android:scheme="https" android:pathPrefix="/intel"></data>
-                <data android:host="www.ingress.com" android:scheme="http" android:pathPrefix="/intel"></data>
+
+                <data
+                    android:host="www.ingress.com"
+                    android:scheme="https"
+                    android:pathPrefix="/intel"></data>
+                <data
+                    android:host="www.ingress.com"
+                    android:scheme="http"
+                    android:pathPrefix="/intel"></data>
             </intent-filter>
         </activity>
         <activity
             android:name="com.cradle.iitc_mobile.IITC_Settings"
             android:theme="@style/AppBaseTheme"
             android:label="@string/app_name"
-            android:configChanges="orientation|keyboard|keyboardHidden|screenSize" >
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize">
         </activity>
+
+        <uses-library
+            android:name="com.sec.android.app.multiwindow"
+            android:required="false"/>
+
+        <meta-data
+            android:name="com.sec.android.support.multiwindow"
+            android:value="true"/>
+
+        <meta-data
+            android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
+            android:resource="@dimen/app_defaultsize_w"/>
+        <meta-data
+            android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H"
+            android:resource="@dimen/app_defaultsize_h"/>
+        <meta-data
+            android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W"
+            android:resource="@dimen/app_minimumsize_w"/>
+        <meta-data
+            android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
+            android:resource="@dimen/app_minimumsize_h"/>
+
     </application>
 
 </manifest>
diff --git a/mobile/res/values/dimens.xml b/mobile/res/values/dimens.xml
index a6dd1403..4fb5f825 100644
--- a/mobile/res/values/dimens.xml
+++ b/mobile/res/values/dimens.xml
@@ -3,5 +3,9 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="app_defaultsize_w">640dip</dimen>
+    <dimen name="app_defaultsize_h">400dip</dimen>
+    <dimen name="app_minimumsize_w">400dip</dimen>
+    <dimen name="app_minimumsize_h">200dip</dimen>
 
 </resources>
\ No newline at end of file

From d61c5cc752320836a7227461c0eace14f86f0bba Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Thu, 23 May 2013 13:18:01 +0200
Subject: [PATCH 2/3] bumped version number

---
 mobile/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index 894d0d6f..f9fc9e4d 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.cradle.iitc_mobile"
-          android:versionCode="21"
-          android:versionName="0.4.0">
+          android:versionCode="22"
+          android:versionName="0.4.1">
 
     <uses-sdk
         android:minSdkVersion="14"

From f58e8cfa83a1caec758f89cd13b8bf73a9822a41 Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Thu, 23 May 2013 13:44:00 +0200
Subject: [PATCH 3/3] fixed typo in API

---
 mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java | 2 +-
 mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java b/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
index ba0ce3d1..db9511ff 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
@@ -153,7 +153,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
             if (result != null) {
                 // authentication succeded, we can load the given url, which will redirect back to the intel map
                 mWebView.loadUrl(result);
-                mActivity.loginSucceded();
+                mActivity.loginSucceeded();
             } else {
                 onLoginFailed();
             }
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 2af11b89..88604777 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -399,7 +399,7 @@ public class IITC_Mobile extends Activity {
     /**
      * called after successful login
      */
-    public void loginSucceded() {
+    public void loginSucceeded() {
         // garbage collection
         mLogin = null;
     }