From a6fd49051c06f0077f58033f7f0f7a061fac6d26 Mon Sep 17 00:00:00 2001
From: santimunin <noreply@pandorafms.org>
Date: Tue, 31 Jul 2012 22:50:37 +0000
Subject: [PATCH] =?UTF-8?q?2012-08-01=20Santiago=20Mun=C3=ADn=20<burning1@?=
=?UTF-8?q?gmail.com>=20=09*=20res/layout/create=5Fincident.xml:=20UI=20ch?=
=?UTF-8?q?anges.=20=09*=20AndroidManifest.xml:=20Removed=20some=20comment?=
=?UTF-8?q?s=20and=20removed=20header=20from=20all=20activities.=20=09*=20?=
=?UTF-8?q?src/pandroid=5Fevent=5Fviewer/pandorafms/PandroidEventviewerAct?=
=?UTF-8?q?ivity.java:=20FIXME=20added.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6836 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
.../pandroid_event_viewer/AndroidManifest.xml | 22 +++++++++----------
extras/pandroid_event_viewer/ChangeLog | 5 +++++
.../res/layout/create_incident.xml | 11 +++++-----
.../PandroidEventviewerActivity.java | 4 ++--
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/extras/pandroid_event_viewer/AndroidManifest.xml b/extras/pandroid_event_viewer/AndroidManifest.xml
index 701aa8eb2a..2bcf0ca44b 100644
--- a/extras/pandroid_event_viewer/AndroidManifest.xml
+++ b/extras/pandroid_event_viewer/AndroidManifest.xml
@@ -26,22 +26,15 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
- <!--
- android:configChanges="orientation|keyboardHidden"
-
- This is crazy, I want only block the screen rotation, but the android need
- two things.
- -->
-
<application
android:description="@string/pandroid_event_viewer_description_str"
android:icon="@drawable/pandorafms_logo"
- android:label="Pandroid Event viewer" >
+ android:label="Pandroid Event viewer"
+ android:theme="@android:style/Theme.NoTitleBar" >
<activity
android:name=".PandroidEventviewerActivity"
android:configChanges="orientation|keyboardHidden"
- android:label="Pandroid Event viewer"
- android:theme="@android:style/Theme.NoTitleBar" >
+ android:label="Pandroid Event viewer" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -80,13 +73,18 @@
android:theme="@android:style/Theme.Dialog" >
</activity>
<activity android:name=".CreateIncidentActivity" />
+
<service android:name=".PandroidEventviewerService" />
- <receiver android:name=".OnBootLoader"
- android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+
+ <receiver
+ android:name=".OnBootLoader"
+ android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
+
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
</application>
+
</manifest>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 7ec6aafcb3..c27fea4bbb 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01 Santiago Munín <burning1@gmail.com>
+ * res/layout/create_incident.xml: UI changes.
+ * AndroidManifest.xml: Removed some comments and removed header from all activities.
+ * src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: FIXME added.
+
2012-08-01 Santiago Munín <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: TODO added.
* res/layout/options.xml: UI changes.
diff --git a/extras/pandroid_event_viewer/res/layout/create_incident.xml b/extras/pandroid_event_viewer/res/layout/create_incident.xml
index 5d858118f2..80ed64674c 100644
--- a/extras/pandroid_event_viewer/res/layout/create_incident.xml
+++ b/extras/pandroid_event_viewer/res/layout/create_incident.xml
@@ -7,10 +7,9 @@
<TableLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="0dp"
+ android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
- android:layout_weight="8"
android:orientation="vertical"
android:stretchColumns="1" >
@@ -58,15 +57,17 @@
</TableLayout>
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_weight="1"
+ android:layout_marginLeft="3dp"
+ android:layout_marginRight="3dp"
+ android:layout_marginTop="20dp"
android:orientation="horizontal" >
<Button
android:id="@+id/incident_create_button"
- android:layout_width="100dp"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/create" />
</LinearLayout>
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
index 89aaff0c2d..1f95370955 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
@@ -40,7 +40,7 @@ import android.util.Log;
import android.widget.BaseAdapter;
import android.widget.TabHost;
import android.widget.Toast;
-
+//FIXME grey buttons doesn't become white when connection is correctly set
public class PandroidEventviewerActivity extends TabActivity implements
Serializable {
private static String TAG = "PandroidEventviewerActivity";
@@ -95,7 +95,7 @@ public class PandroidEventviewerActivity extends TabActivity implements
this.loadInProgress = false;
- // Check if the preferences is setted, if not show the option activity.
+ // Check if the preferences are set, if not show the option activity.
if ((user.length() == 0) && (password.length() == 0)
&& (url.length() == 0)) {
startActivity(new Intent(this, Options.class));