tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-08-01 Santiago Munín <burning1@gmail.com>

Browse Source 
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: TODO added.
	* res/layout/options.xml: UI changes.
	* res/values/strings.xml: Changed an entry.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6835 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
santimunin 2012-07-31 22:25:24 +00:00
parent 990da2e5f2
commit f3ca701fe9
4 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,8 @@
2012-08-01 Santiago Munín <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: TODO added.
* res/layout/options.xml: UI changes.
* res/values/strings.xml: Changed an entry.
2012-07-30 Santiago Munín <burning1@gmail.com> 2012-07-30 Santiago Munín <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java, * src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Changed time measurement in the background check events. src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Changed time measurement in the background check events.

117
extras/pandroid_event_viewer/res/layout/options.xml
View File

@ -27,6 +27,7 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
@ -39,7 +40,6 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="5dp"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
@ -98,65 +98,68 @@
android:inputType="textPassword" android:inputType="textPassword"
android:singleLine="true" /> android:singleLine="true" />
<RelativeLayout <TableLayout
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="20dp"
android:layout_marginRight="5dp" android:layout_marginRight="20dp"
android:orientation="horizontal" > android:layout_marginTop="10dp"
android:stretchColumns="0,1" >
<LinearLayout <TableRow android:layout_marginTop="10dp" >
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/refresh_time_label_str" android:gravity="left"
android:textColor="#ffffff" /> android:orientation="vertical" >
<Spinner <TextView
android:id="@+id/refresh_combo" android:layout_width="wrap_content"
android:layout_width="155dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" /> android:paddingLeft="2dp"
</LinearLayout> android:text="@string/refresh_time_label_str"
android:textColor="#ffffff" />
<LinearLayout <Spinner
android:layout_width="wrap_content" android:id="@+id/refresh_combo"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_alignParentRight="true" android:layout_height="wrap_content" />
android:orientation="vertical" > </LinearLayout>
<TextView <LinearLayout
android:id="@+id/check_connection_status" android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:drawableBottom="@drawable/help"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/check_connection" android:orientation="vertical" >
<TextView
android:id="@+id/check_connection_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableBottom="@drawable/help"
android:text="@string/check_connection"
android:textColor="#ffffff" />
</LinearLayout>
</TableRow>
<TableRow android:layout_marginTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:paddingLeft="2dp"
android:text="@string/enable_background_service"
android:textColor="#ffffff" /> android:textColor="#ffffff" />
</LinearLayout>
</RelativeLayout>
<LinearLayout <CheckBox
android:layout_width="match_parent" android:id="@+id/background_service_on"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:orientation="horizontal" > android:layout_height="wrap_content"
android:layout_gravity="center" />
<TextView </TableRow>
android:layout_width="wrap_content" </TableLayout>
android:layout_height="wrap_content"
android:layout_marginRight="60dp"
android:text="@string/enable_background_service"
android:textColor="#ffffff" />
<CheckBox
android:id="@+id/background_service_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -181,9 +184,7 @@
<TableRow> <TableRow>
<TextView <TextView android:text="@string/vibration" />
style="@style/options_entry_text"
android:text="@string/vibration" />
<CheckBox <CheckBox
android:id="@+id/vibration_on" android:id="@+id/vibration_on"
@ -193,9 +194,7 @@
<TableRow> <TableRow>
<TextView <TextView android:text="@string/led_flash" />
style="@style/options_entry_text"
android:text="@string/led_flash" />
<CheckBox <CheckBox
android:id="@+id/led_flash_on" android:id="@+id/led_flash_on"
@ -208,14 +207,12 @@
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/textView1"
style="@style/options_entry_text"
android:text="@string/sound" /> android:text="@string/sound" />
<Button <Button
android:id="@+id/sound_button" android:id="@+id/sound_button"
android:layout_width="100dp" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:layout_marginRight="10dp" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</LinearLayout> </LinearLayout>
@ -228,9 +225,11 @@
<Button <Button
android:id="@+id/update_options" android:id="@+id/update_options"
android:layout_width="200dp" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/update_button_str" /> android:text="@string/update_button_str" />
</LinearLayout> </LinearLayout>

2
extras/pandroid_event_viewer/res/values/strings.xml
View File

@ -119,7 +119,7 @@
<string name="connection_problem">There was a problem. Check your connection.</string> <string name="connection_problem">There was a problem. Check your connection.</string>
<string name="connection_settings_problem">The operation can not be performed until you configure a correct connection.</string> <string name="connection_settings_problem">The operation can not be performed until you configure a correct connection.</string>
<string name="unknown_version">Unknown version</string> <string name="unknown_version">Unknown version</string>
<string name="enable_background_service">Check events in background</string> <string name="enable_background_service">Check in background</string>
<string name="default_profile_can_not_remove">Default profile can not be removed</string> <string name="default_profile_can_not_remove">Default profile can not be removed</string>
</resources> </resources>

2
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
View File

@ -198,7 +198,7 @@ public class PandroidEventviewerActivity extends TabActivity implements
*/ */
private void process_notification(Intent intent) { private void process_notification(Intent intent) {
int more_criticity = intent.getIntExtra("more_criticity", -1); int more_criticity = intent.getIntExtra("more_criticity", -1);
//TODO retrieve time
CharSequence text; CharSequence text;
// From the notification // From the notification