From e0cc34934131eec9e8ab1309a0effe8d1207adf0 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 28 Oct 2013 14:34:32 +0000
Subject: [PATCH] 2013-10-28 Miguel de Dios <miguel.dedios@artica.es>

	* .classpath: some changes that eclipse makes "automagicaly".

	* src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java:
	fixed java-android warnings.

	* res/layout/activity_web_view.xml: improved the source code style.

	* AndroidManifest.xml: fixed with ugly fix the lost "option button"
	in the phones/tables with android version over that honeycomb and
	have not a fisical option menu. Fixes the warnings of android.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8968 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 extras/PandoraFMS_android_console/.classpath        |  2 +-
 .../PandoraFMS_android_console/AndroidManifest.xml  | 11 ++++++-----
 extras/PandoraFMS_android_console/ChangeLog         | 13 +++++++++++++
 .../res/layout/activity_web_view.xml                |  2 +-
 .../pandorafmsandroidconsole/PandoraWebView.java    |  5 ++---
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/extras/PandoraFMS_android_console/.classpath b/extras/PandoraFMS_android_console/.classpath
index bb0c759770..7bc01d9a9c 100644
--- a/extras/PandoraFMS_android_console/.classpath
+++ b/extras/PandoraFMS_android_console/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/extras/PandoraFMS_android_console/AndroidManifest.xml b/extras/PandoraFMS_android_console/AndroidManifest.xml
index f7e4de9cfe..df6c9b4e76 100644
--- a/extras/PandoraFMS_android_console/AndroidManifest.xml
+++ b/extras/PandoraFMS_android_console/AndroidManifest.xml
@@ -4,9 +4,11 @@
 	android:versionCode="1"
 	android:versionName="1.0" >
 	
+    <uses-permission android:name="android.permission.INTERNET" />
+    
 	<uses-sdk
 		android:minSdkVersion="8"
-		android:targetSdkVersion="17" />
+		android:targetSdkVersion="11" />
 	
 	<application
 		android:allowBackup="true"
@@ -16,8 +18,10 @@
 		
 		<activity
 			android:name="pandorafms.pandorafmsandroidconsole.PandoraWebView"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
 			android:label="@string/app_name"
-			android:theme="@android:style/Theme.NoTitleBar" >
+			
+			android:theme="@android:style/Theme.NoTitleBar">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -44,8 +48,5 @@
 			android:label="@string/connection_str"
 			android:theme="@android:style/Theme.Dialog" >
 		</activity>
-		
 	</application>
-	
-	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/extras/PandoraFMS_android_console/ChangeLog b/extras/PandoraFMS_android_console/ChangeLog
index 5034c6335d..47f6d272f0 100644
--- a/extras/PandoraFMS_android_console/ChangeLog
+++ b/extras/PandoraFMS_android_console/ChangeLog
@@ -1,3 +1,16 @@
+2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* .classpath: some changes that eclipse makes "automagicaly".
+	
+	* src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java:
+	fixed java-android warnings.
+	
+	* res/layout/activity_web_view.xml: improved the source code style.
+	
+	* AndroidManifest.xml: fixed with ugly fix the lost "option button"
+	in the phones/tables with android version over that honeycomb and
+	have not a fisical option menu. Fixes the warnings of android.
+
 2013-05-30 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* AndroidManifest.xml: added icon for application.
diff --git a/extras/PandoraFMS_android_console/res/layout/activity_web_view.xml b/extras/PandoraFMS_android_console/res/layout/activity_web_view.xml
index b9912c891f..26ddeb4ef1 100644
--- a/extras/PandoraFMS_android_console/res/layout/activity_web_view.xml
+++ b/extras/PandoraFMS_android_console/res/layout/activity_web_view.xml
@@ -6,7 +6,7 @@
 	android:paddingLeft="0px"
 	android:paddingRight="0px"
 	android:paddingTop="0px"
-	tools:context=".WebView" >
+	tools:context=".WebView">
 	
 	<WebView
 		android:id="@+id/webview"
diff --git a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java
index 656ed996e5..802f3408b2 100644
--- a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java
+++ b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java
@@ -74,9 +74,8 @@ public class PandoraWebView extends Activity {
 				//connection message
 				
 				//Close the CustomToast (I love this hack, fuck javalovers and yours patterns.).
-				ConnectionCustomToast connectionCustomToast = new ConnectionCustomToast();
-				if (connectionCustomToast.activity != null)
-					connectionCustomToast.activity.finish();
+				if (ConnectionCustomToast.activity != null)
+					ConnectionCustomToast.activity.finish();
 			}
 		});