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.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6836 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
santimunin 2012-07-31 22:50:37 +00:00
parent f3ca701fe9
commit 920b6d855d
4 changed files with 23 additions and 19 deletions

View File

@ -26,22 +26,15 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" /> <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 <application
android:description="@string/pandroid_event_viewer_description_str" android:description="@string/pandroid_event_viewer_description_str"
android:icon="@drawable/pandorafms_logo" android:icon="@drawable/pandorafms_logo"
android:label="Pandroid Event viewer" > android:label="Pandroid Event viewer"
android:theme="@android:style/Theme.NoTitleBar" >
<activity <activity
android:name=".PandroidEventviewerActivity" android:name=".PandroidEventviewerActivity"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:label="Pandroid Event viewer" android:label="Pandroid Event viewer" >
android:theme="@android:style/Theme.NoTitleBar" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -80,13 +73,18 @@
android:theme="@android:style/Theme.Dialog" > android:theme="@android:style/Theme.Dialog" >
</activity> </activity>
<activity android:name=".CreateIncidentActivity" /> <activity android:name=".CreateIncidentActivity" />
<service android:name=".PandroidEventviewerService" /> <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> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.BOOT_COMPLETED" />
<category android:name="android.intent.category.HOME" /> <category android:name="android.intent.category.HOME" />
</intent-filter> </intent-filter>
</receiver> </receiver>
</application> </application>
</manifest> </manifest>

View File

@ -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> 2012-08-01 Santiago Munín <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: TODO added. * src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: TODO added.
* res/layout/options.xml: UI changes. * res/layout/options.xml: UI changes.

View File

@ -7,10 +7,9 @@
<TableLayout <TableLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_weight="8"
android:orientation="vertical" android:orientation="vertical"
android:stretchColumns="1" > android:stretchColumns="1" >
@ -58,15 +57,17 @@
</TableLayout> </TableLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_weight="1" android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginTop="20dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<Button <Button
android:id="@+id/incident_create_button" android:id="@+id/incident_create_button"
android:layout_width="100dp" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/create" /> android:text="@string/create" />
</LinearLayout> </LinearLayout>

View File

@ -40,7 +40,7 @@ import android.util.Log;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.TabHost; import android.widget.TabHost;
import android.widget.Toast; import android.widget.Toast;
//FIXME grey buttons doesn't become white when connection is correctly set
public class PandroidEventviewerActivity extends TabActivity implements public class PandroidEventviewerActivity extends TabActivity implements
Serializable { Serializable {
private static String TAG = "PandroidEventviewerActivity"; private static String TAG = "PandroidEventviewerActivity";
@ -95,7 +95,7 @@ public class PandroidEventviewerActivity extends TabActivity implements
this.loadInProgress = false; 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) if ((user.length() == 0) && (password.length() == 0)
&& (url.length() == 0)) { && (url.length() == 0)) {
startActivity(new Intent(this, Options.class)); startActivity(new Intent(this, Options.class));