From 331c225fba9a035b65ee98ec9a00c7537a15d1fa Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 31 Oct 2013 14:19:04 +0000
Subject: [PATCH] 2013-10-31  Miguel de Dios  <miguel.dedios@artica.es>

	* res/layout/main.xml, res/layout/options.xml,
	res/values-ja/strings.xml, res/values/strings.xml,
	res/values/styles.xml, res/menu/options_menu_list_events.xml,
	res/menu/options_menu.xml, res/values-es/strings.xml: changed the
	style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8989 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 extras/pandroid_event_viewer/ChangeLog        |  16 +-
 .../pandroid_event_viewer/res/layout/main.xml | 305 ++++++++++--------
 .../res/layout/options.xml                    | 280 ++++++++--------
 .../res/menu/options_menu.xml                 |   2 +-
 .../res/menu/options_menu_list_events.xml     |   2 +-
 .../res/values-es/strings.xml                 |   2 +-
 .../res/values-ja/strings.xml                 |   2 +-
 .../res/values/strings.xml                    |   2 +-
 .../res/values/styles.xml                     |  21 +-
 9 files changed, 326 insertions(+), 306 deletions(-)

diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index f71cf6ed67..36c8961f88 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,4 +1,12 @@
-2012-10-31  Miguel de Dios  <miguel.dedios@artica.es>
+2013-10-31  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* res/layout/main.xml, res/layout/options.xml,
+	res/values-ja/strings.xml, res/values/strings.xml,
+	res/values/styles.xml, res/menu/options_menu_list_events.xml,
+	res/menu/options_menu.xml, res/values-es/strings.xml: changed the
+	style app.
+
+2013-10-31  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* res/layout/options.xml,
 	res/drawable/edittext_pandora_default_shape.xml,
@@ -6,18 +14,18 @@
 	res/drawable/edittext_pandora_select_shape.xml,
 	res/values/styles.xml: changed the style of options layout.
 
-2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>
+2013-10-30  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* res/layout/options.xml, res/values-ja/strings.xml,
 	res/values/strings.xml, res/values-es/strings.xml: changed the
 	style of app, wip.
 
-2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>
+2013-10-30  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* res/values/styles.xml, res/layout/options.xml: I have started to
 	set the new style of app (Thanks Carla).
 
-2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>
+2013-10-30  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
 	fixed when the data return to call for get events is bad format,
diff --git a/extras/pandroid_event_viewer/res/layout/main.xml b/extras/pandroid_event_viewer/res/layout/main.xml
index b3b66347e7..aa6b597412 100644
--- a/extras/pandroid_event_viewer/res/layout/main.xml
+++ b/extras/pandroid_event_viewer/res/layout/main.xml
@@ -15,50 +15,62 @@
 // GNU General Public License for more details. 
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/background_pandora"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content" >
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
         android:orientation="vertical" >
 
-        <TableLayout
+        <LinearLayout
+            style="@style/margin_pandora"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:stretchColumns="0" >
+            android:orientation="vertical" >
 
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="@string/profile_label_str"
-                    android:textStyle="bold" />
+                    android:layout_weight="1"
+                    android:text="@string/profile_label_str" />
 
                 <Spinner
                     android:id="@+id/profile_combo"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </TableRow>
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="2dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:background="#ffffff" />
+
+        <LinearLayout
+            style="@style/margin_pandora"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
 
             <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="2dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
-                android:background="#ffffff" />
-
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -76,13 +88,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right" />
-            </TableRow>
+            </LinearLayout>
 
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -94,13 +108,15 @@
                     android:id="@+id/status_combo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
-            </TableRow>
+            </LinearLayout>
 
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -110,6 +126,7 @@
 
                 <EditText
                     android:id="@+id/tag_text"
+                    style="@style/edittext_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:inputType="text"
@@ -125,148 +142,154 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right" />
-            </TableRow>
-        </TableLayout>
+            </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="5dp"
-            android:orientation="horizontal" >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="5dp"
+                android:orientation="horizontal" >
 
-            <TextView
-                android:layout_width="0dip"
+                <TextView
+                    style="@style/label_pandora"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="3"
+                    android:text="@string/advanced_options" />
+
+                <CheckBox
+                    android:id="@+id/checkBox_advanced_options"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/show_hide_layout"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="3"
-                android:text="@string/advanced_options"
-                android:textColor="#ffffff" />
+                android:orientation="vertical"
+                android:padding="5dp"
+                android:visibility="gone" >
 
-            <CheckBox
-                android:id="@+id/checkBox_advanced_options"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-        </LinearLayout>
+                <TextView
+                    style="@style/label_pandora"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/agent_label_str" />
 
-        <LinearLayout
-            android:id="@+id/show_hide_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="5dp"
-            android:visibility="gone" >
+                <EditText
+                    android:id="@+id/agent_name"
+                    style="@style/edittext_pandora"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/agent_label_str" />
+                <TextView
+                    style="@style/label_pandora"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/event_search_label_str" />
 
-            <EditText
-                android:id="@+id/agent_name"
+                <EditText
+                    android:id="@+id/event_search_text"
+                    style="@style/edittext_pandora"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true" />
+
+                <TableLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" >
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/label_pandora"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:paddingRight="5dip"
+                            android:text="@string/severity_label_str" />
+
+                        <Spinner
+                            android:id="@+id/severity_combo"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/label_pandora"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:paddingRight="5dip"
+                            android:text="@string/max_time_old_event_str" />
+
+                        <Spinner
+                            android:id="@+id/max_time_old_event_combo"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                    </TableRow>
+                </TableLayout>
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:inputType="text"
-                android:singleLine="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/event_search_label_str" />
-
-            <EditText
-                android:id="@+id/event_search_text"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:inputType="text"
-                android:singleLine="true" />
+                android:layout_height="2dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:background="#ffffff" />
 
             <TableLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:stretchColumns="0,1" >
 
-                <TableRow>
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" >
 
-                    <TextView
+                    <Button
+                        android:id="@+id/button_set_as_filter_watcher"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:paddingRight="5dip"
-                        android:text="@string/severity_label_str" />
+                        android:text="@string/set_as_filter_watcher_button_str" />
 
-                    <Spinner
-                        android:id="@+id/severity_combo"
+                    <Button
+                        android:id="@+id/button_send"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:text="@string/search_button_str" />
                 </TableRow>
 
-                <TableRow>
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" >
 
-                    <TextView
+                    <Button
+                        android:id="@+id/button_save_profile"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
                         android:layout_weight="1"
-                        android:paddingRight="5dip"
-                        android:text="@string/max_time_old_event_str" />
+                        android:text="@string/save_profile_button_str" />
 
-                    <Spinner
-                        android:id="@+id/max_time_old_event_combo"
+                    <Button
+                        android:id="@+id/button_delete_profile"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/profile_delete" />
                 </TableRow>
             </TableLayout>
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="2dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="#ffffff" />
-
-        <TableLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:stretchColumns="0,1" >
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <Button
-                    android:id="@+id/button_set_as_filter_watcher"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/set_as_filter_watcher_button_str" />
-
-                <Button
-                    android:id="@+id/button_send"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/search_button_str" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <Button
-                    android:id="@+id/button_save_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/save_profile_button_str" />
-
-                <Button
-                    android:id="@+id/button_delete_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/profile_delete" />
-            </TableRow>
-        </TableLayout>
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/layout/options.xml b/extras/pandroid_event_viewer/res/layout/options.xml
index 9a96db9c4c..f1c97a6077 100644
--- a/extras/pandroid_event_viewer/res/layout/options.xml
+++ b/extras/pandroid_event_viewer/res/layout/options.xml
@@ -16,10 +16,9 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/background_pandora"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="#242424"
->
+    android:layout_height="wrap_content" >
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -37,145 +36,140 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:text="@string/connection"
-            />
+                android:text="@string/connection" />
 
             <LinearLayout
+                style="@style/margin_pandora"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:padding="10dp">
+                android:orientation="vertical" >
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="5dip"
-                    android:text="@string/url_label_str"
-                    style="@style/options_label" />
+                    android:text="@string/url_label_str" />
 
                 <EditText
                     android:id="@+id/url"
+                    style="@style/edittext_pandora"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textWebEditText"
-                    android:singleLine="true"
-                    style="@style/options_edittext"/>
+                    android:singleLine="true" />
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="5dip"
-                    android:text="@string/user_label_str"
-                    style="@style/options_label"
-                 />
+                    android:text="@string/user_label_str" />
 
                 <EditText
                     android:id="@+id/user"
+                    style="@style/edittext_pandora"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="text"
-                    android:singleLine="true"
-                    style="@style/options_edittext" />
+                    android:singleLine="true" />
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="5dip"
-                    android:text="@string/password_label_str"
-                    style="@style/options_label"
-                />
+                    android:text="@string/password_label_str" />
 
                 <EditText
                     android:id="@+id/password"
+                    style="@style/edittext_pandora"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textPassword"
-                    android:singleLine="true"
-                    style="@style/options_edittext" />
+                    android:singleLine="true" />
 
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="5dip"
-                    android:text="@string/api_password_label_str"
-                    style="@style/options_label"
-                />
+                    android:text="@string/api_password_label_str" />
 
                 <EditText
                     android:id="@+id/api_password"
+                    style="@style/edittext_pandora"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textPassword"
-                    android:singleLine="true"
-                    style="@style/options_edittext"
-                    />
-                
+                    android:singleLine="true" />
+
                 <TextView
+                    style="@style/label_pandora"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingLeft="2dp"
-                    android:text="@string/refresh_time_label_str"
-                    style="@style/options_label"
-                />
+                    android:text="@string/refresh_time_label_str" />
 
                 <Spinner
                     android:id="@+id/refresh_combo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
-                
-				<TextView
-			          android:layout_width="wrap_content"
-			          android:layout_height="wrap_content"
-			          android:paddingLeft="2dp"
-			          android:text="@string/timeout_connections_label_str"
-			          style="@style/options_label"
-			     />
-				<LinearLayout
-				    android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:orientation="horizontal"
-				>
-					<EditText
-						android:id="@+id/timeout_connections"
-						android:layout_height="wrap_content"
-						android:layout_width="wrap_content"
-						android:ems="3"
-						android:inputType="number"
-						android:singleLine="true"
-						android:gravity="right"
-						style="@style/options_edittext" />
-					<TextView
-			          android:layout_width="wrap_content"
-			          android:layout_height="wrap_content"
-			          android:text="@string/seconds_label_str"
-			          style="@style/options_label"
-			          android:paddingLeft="5dp"
-			          android:layout_gravity="center_vertical"
-			     	  />
-				</LinearLayout>
-				<LinearLayout
-				    android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:orientation="horizontal"
-				>
-					<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"
-                            style="@style/options_label"
-                            android:layout_weight="1"
-                         />
 
-                        <CheckBox
-                            android:id="@+id/background_service_on"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_weight="0" />
-				</LinearLayout>
+                <TextView
+                    style="@style/label_pandora"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="2dp"
+                    android:text="@string/timeout_connections_label_str" />
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <EditText
+                        android:id="@+id/timeout_connections"
+                        style="@style/edittext_pandora"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ems="3"
+                        android:gravity="right"
+                        android:inputType="number"
+                        android:singleLine="true" />
+
+                    <TextView
+                        style="@style/label_pandora"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingLeft="5dp"
+                        android:text="@string/seconds_label_str" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        style="@style/label_pandora"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|center_vertical"
+                        android:layout_weight="1"
+                        android:paddingLeft="2dp"
+                        android:text="@string/enable_background_service" />
+
+                    <CheckBox
+                        android:id="@+id/background_service_on"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="0" />
+                </LinearLayout>
+
                 <TableLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -192,21 +186,17 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:drawableBottom="@drawable/help"
-                            android:text="@string/check_connection"
-                        />
+                            android:text="@string/check_connection" />
                     </TableRow>
-
                 </TableLayout>
             </LinearLayout>
-            
-            
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="20dp"
-            android:orientation="vertical">
-            
+            android:orientation="vertical" >
 
             <TextView
                 style="@style/options_header"
@@ -214,26 +204,26 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:text="@string/notification" />
-            
-              <LinearLayout
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginBottom="20dp"
-	            android:orientation="vertical"
-	            android:padding="10dp">
-            
+
             <LinearLayout
-				    android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:orientation="horizontal"
-				>
-                <TextView
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/vibration"
-                        style="@style/options_label"
-                        android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dp"
+                android:orientation="vertical"
+                android:padding="10dp" >
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        style="@style/label_pandora"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="@string/vibration" />
 
                     <CheckBox
                         android:id="@+id/vibration_on"
@@ -241,19 +231,20 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_weight="0" />
-            </LinearLayout>
-            <LinearLayout
-				    android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:orientation="horizontal"
-				>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
                     <TextView
-                         android:layout_width="wrap_content"
+                        style="@style/label_pandora"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="@string/led_flash"
-                        style="@style/options_label"
-                        android:layout_weight="1" />
+                        android:layout_weight="1"
+                        android:text="@string/led_flash" />
 
                     <CheckBox
                         android:id="@+id/led_flash_on"
@@ -261,46 +252,45 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_weight="0" />
-            </LinearLayout>
-            <LinearLayout
-				    android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:orientation="horizontal"
-				>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
                     <TextView
                         android:id="@+id/textView1"
-                          android:layout_width="wrap_content"
+                        style="@style/label_pandora"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="@string/sound"
-                        style="@style/options_label"
-                        android:layout_weight="1" />
+                        android:layout_weight="1"
+                        android:text="@string/sound" />
 
                     <Button
                         android:id="@+id/sound_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="0" />
+                </LinearLayout>
             </LinearLayout>
 
-            
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:layout_marginBottom="10dp"
+                android:background="#ffffff" />
+
+            <Button
+                android:id="@+id/update_options"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:text="@string/update_button_str" />
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="2dp"
-            android:layout_marginBottom="10dp"
-            android:background="#ffffff" />
-
-        <Button
-            android:id="@+id/update_options"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:text="@string/update_button_str" />
-    </LinearLayout>
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/menu/options_menu.xml b/extras/pandroid_event_viewer/res/menu/options_menu.xml
index 01d0593fad..0e29c6bb24 100644
--- a/extras/pandroid_event_viewer/res/menu/options_menu.xml
+++ b/extras/pandroid_event_viewer/res/menu/options_menu.xml
@@ -19,7 +19,7 @@
     <item
         android:id="@+id/options_button_menu_options"
         android:icon="@drawable/config"
-        android:title="@string/options_label_str"/>
+        android:title="@string/label_pandora_str"/>
     <item
         android:id="@+id/about_button_menu_options"
         android:icon="@drawable/about"
diff --git a/extras/pandroid_event_viewer/res/menu/options_menu_list_events.xml b/extras/pandroid_event_viewer/res/menu/options_menu_list_events.xml
index 98f66879cc..12107733b8 100644
--- a/extras/pandroid_event_viewer/res/menu/options_menu_list_events.xml
+++ b/extras/pandroid_event_viewer/res/menu/options_menu_list_events.xml
@@ -19,7 +19,7 @@
     <item
         android:id="@+id/options_button_menu_options"
         android:icon="@drawable/config"
-        android:title="@string/options_label_str"/>
+        android:title="@string/label_pandora_str"/>
     <item
         android:id="@+id/refresh_button_menu_options"
         android:icon="@drawable/refresh"
diff --git a/extras/pandroid_event_viewer/res/values-es/strings.xml b/extras/pandroid_event_viewer/res/values-es/strings.xml
index f02b97b8d7..c02a440b3c 100644
--- a/extras/pandroid_event_viewer/res/values-es/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-es/strings.xml
@@ -23,7 +23,7 @@
 	<string name="reset_button_str">Reseteo</string>
 	<string name="search_button_str">Buscar</string>
 	<string name="loading_label_str">Cargando</string>
-	<string name="options_label_str">Opciones</string>
+	<string name="label_pandora_str">Opciones</string>
 	<string name="refresh_label_str">Refrescar</string>
 	<string name="url_label_str">URL</string>
 	<string name="user_label_str">Usuario</string>
diff --git a/extras/pandroid_event_viewer/res/values-ja/strings.xml b/extras/pandroid_event_viewer/res/values-ja/strings.xml
index cbb05f33d6..12e03a3760 100644
--- a/extras/pandroid_event_viewer/res/values-ja/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-ja/strings.xml
@@ -28,7 +28,7 @@
 	<string name="reset_button_str">リセット</string>
 	<string name="search_button_str">検索</string>
 	<string name="loading_label_str">読み込み</string>
-	<string name="options_label_str">オプション</string>
+	<string name="label_pandora_str">オプション</string>
 	<string name="url_label_str">URL</string>
 	<string name="user_label_str">ユーザ</string>
 	<string name="password_label_str">パスワード</string>
diff --git a/extras/pandroid_event_viewer/res/values/strings.xml b/extras/pandroid_event_viewer/res/values/strings.xml
index 4367026255..cb5a5b275d 100644
--- a/extras/pandroid_event_viewer/res/values/strings.xml
+++ b/extras/pandroid_event_viewer/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="reset_button_str">Reset</string>
     <string name="search_button_str">Search</string>
     <string name="loading_label_str">Loading</string>
-    <string name="options_label_str">Options</string>
+    <string name="label_pandora_str">Options</string>
     <string name="refresh_label_str">Refresh</string>
     <string name="about_label_str">About</string>
     <string name="url_label_str">URL</string>
diff --git a/extras/pandroid_event_viewer/res/values/styles.xml b/extras/pandroid_event_viewer/res/values/styles.xml
index a9e0f2171e..4de6896a00 100644
--- a/extras/pandroid_event_viewer/res/values/styles.xml
+++ b/extras/pandroid_event_viewer/res/values/styles.xml
@@ -22,22 +22,14 @@
         <item name="android:layout_marginTop">1dp</item>
         <item name="android:layout_marginBottom">2dp</item>
     </style>
-
-    <style name="options_entry_text">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">20dp</item>
-        <item name="android:layout_margin">5dp</item>
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
     
-    <style name="options_label">
+    <style name="label_pandora">
         <item name="android:textColor">#F1F1F1</item>
         <item name="android:textSize">18dp</item>
         <item name="android:textStyle">bold</item>
     </style>
     
-    <style name="options_edittext">
+    <style name="edittext_pandora">
         <item name="android:textColor">#2C2C2C</item>
         <item name="android:textSize">14dp</item>
         <item name="android:padding">5dp</item>
@@ -45,6 +37,13 @@
         <item name="android:layout_marginTop">5dp</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
-
+    
+    <style name="margin_pandora">
+        <item name="android:padding">10dp</item>
+    </style>
+	
+    <style name="background_pandora">
+        <item name="android:background">#242424</item>
+    </style>
 
 </resources>
\ No newline at end of file