Cleanup resources of OPP

Modify according to Ranian's comments
- adjust layout
- remove Capitalized resource names
- format

6 files changed, 137 insertions, 176 deletions

diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index a7043d77b..54cf08810 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -6,8 +6,7 @@
     android:layout_width="fill_parent">
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="vertical">
 
@@ -29,4 +28,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/bt_enabling_progress.xml b/res/layout/bt_enabling_progress.xml
index 8da77ae7e..ea5ba45b8 100644
--- a/res/layout/bt_enabling_progress.xml
+++ b/res/layout/bt_enabling_progress.xml
@@ -14,8 +14,7 @@
         android:id="@+id/progress_info"
         android:layout_height="fill_parent"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="10px"
-        android:gravity="left"
+        android:layout_marginLeft="10dip"
     />
 
  </LinearLayout>
diff --git a/res/layout/confirm_dialog.xml b/res/layout/confirm_dialog.xml
index 827c2e478..6c0a81bbc 100644
--- a/res/layout/confirm_dialog.xml
+++ b/res/layout/confirm_dialog.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-
-    <TextView
-	android:id="@+id/content"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:text="@string/hello"
-    />
-</LinearLayout>
+    android:layout_marginLeft="10dip"
+/>
+
diff --git a/res/layout/file_transfer.xml b/res/layout/file_transfer.xml
index cca9ebe67..31a160d83 100644
--- a/res/layout/file_transfer.xml
+++ b/res/layout/file_transfer.xml
@@ -1,75 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
     android:orientation="vertical">
 
-
-    <TextView 
+    <TextView
         android:id="@+id/line1_view"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6px"
+        android:layout_marginLeft="6dip"
         android:textSize="16sp"
-        android:text="@string/download_line1"/>
+        android:text="@string/download_line1" />
 
     <TextView
         android:id="@+id/line2_view"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6px"
+        android:layout_marginLeft="6dip"
         android:textSize="16sp"
-        android:text="@string/download_line2"/>
+        android:text="@string/download_line2" />
 
     <TextView
         android:id="@+id/line3_view"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6px"
+        android:layout_marginLeft="6dip"
         android:textSize="16sp"
-        android:text="@string/download_line3"/>
+        android:text="@string/download_line3" />
 
     <TextView
         android:id="@+id/line4_view"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6px"
+        android:layout_marginLeft="6dip"
         android:textSize="16sp"
-        android:text="@string/download_line4"/>
-     
+        android:text="@string/download_line4" />
+
     <TextView
         android:id="@+id/line5_view"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:gravity="center"
         android:textSize="16sp"
-        android:text="@string/download_line5"/>
+        android:text="@string/download_line5" />
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         >
 
-    <TextView
-        android:id="@+id/progress_percent"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="10px"
-        android:gravity="left"
-        />
-
-    <ProgressBar android:id="@+id/progress_transfer"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_marginLeft="10px"
-        android:layout_marginRight="10px"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:max="100"
-        android:progress="100" />
+        <TextView
+            android:id="@+id/progress_percent"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:gravity="left"/>
 
+        <ProgressBar android:id="@+id/progress_transfer"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:max="100"
+            android:progress="100" />
     </LinearLayout>
 
-</TableLayout>
+</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index ddf2bf494..e66b15dc2 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- Layout used for ProgressCategory in bluetooth settings. -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="27dip"
-    android:background="@*android:drawable/settings_header">
+    style="?android:attr/listSeparatorTextViewStyle">
 
+    <!-- This and the other text view have the style of the list separator text view without the background and padding -->
     <TextView 
-        android:id="@+android:id/title"
         style="?android:attr/listSeparatorTextViewStyle"
+        android:background="@null"
+        android:paddingLeft="0dip"
+        android:id="@+android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
     />
 
     <ProgressBar
@@ -23,13 +27,14 @@
         />
 
     <TextView 
+        style="?android:attr/listSeparatorTextViewStyle"
+        android:background="@null"
+        android:paddingLeft="0dip"
         android:id="@+id/scanning_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toLeftOf="@id/scanning_progress"
-        android:textSize="18sp"
-        android:textColor="@android:color/primary_text_light"
         android:layout_marginRight="5sp"
         android:text="@string/progress_scanning"
         />
diff --git a/res/layout/testactivity_main.xml b/res/layout/testactivity_main.xml
index 36a77b9ab..bf9fa117a 100644
--- a/res/layout/testactivity_main.xml
+++ b/res/layout/testactivity_main.xml
@@ -2,140 +2,107 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    >
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    >
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left" >
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/Insert_record" />
-    <EditText
-        android:id="@+id/Insert_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        />
-    </LinearLayout>    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left" >    
-    <EditText
-        android:id="@+id/Media_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        />
-    <EditText
-        android:id="@+id/Address_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        />
-    <Button
-        android:id="@+id/Insert_record"
+    android:layout_height="wrap_content">
+    <LinearLayout android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/OK_button" />
-    </LinearLayout>
+        android:layout_gravity="left">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/insert_record" />
+        <EditText android:id="@+id/insert_text"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
     </LinearLayout>
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left" >
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/Delete_record" />
-    <EditText
-        android:id="@+id/Delete_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        />
-        
-    <Button
-        android:id="@+id/Delete_record"
+
+    <LinearLayout android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/OK_button" />
+        android:layout_gravity="left">
+        <EditText android:id="@+id/media_text"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <EditText android:id="@+id/address_text"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <Button android:id="@+id/insert_record"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/ok_button" />
     </LinearLayout>
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left" >
-    <TextView
+
+    <LinearLayout android:orientation="horizontal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/Update_record" />
-    <EditText
-        android:id="@+id/Update_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        />
-        
-    <Button
-        android:id="@+id/Update_record"
+        android:layout_height="wrap_content">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/delete_record" />
+        <EditText android:id="@+id/delete_text"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <Button android:id="@+id/delete_record"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/ok_button" />
+    </LinearLayout>
+
+    <LinearLayout android:orientation="horizontal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/OK_button" />
+        android:layout_height="wrap_content">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/update_record" />
+        <EditText android:id="@+id/update_text"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <Button android:id="@+id/update_record"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/ok_button" />
     </LinearLayout>
-      
-    <LinearLayout
-        android:orientation="horizontal"
+
+    <LinearLayout android:orientation="horizontal"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/ack_record" />
+        <EditText android:id="@+id/ack_text"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <Button android:id="@+id/ack_record"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="3dip"
+            android:text="@string/ok_button" />
+    </LinearLayout>
+
+    <Button android:id="@+id/deleteAll_record"
         android:layout_height="wrap_content"
-        android:layout_gravity="left" >
-    <TextView
         android:layout_width="wrap_content"
+        android:text="@string/deleteAll_record"></Button>
+
+    <Button android:id="@+id/start_server"
         android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/Ack_record" />
-    <EditText
-        android:id="@+id/Ack_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        />
-        
-    <Button
-        android:id="@+id/Ack_record"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/OK_button" />
-    </LinearLayout>
-
-<Button 
-    android:id="@+id/DeleteAll_record"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:text="@string/DeleteAll_record"></Button>
+        android:text="@string/start_server"></Button>
 
-<Button 
-    android:id="@+id/Start_server"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:text="@string/Start_server"></Button>
-    
-    <Button 
-    android:id="@+id/Notify_server"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:text="@string/Notify_server"></Button>
+    <Button android:id="@+id/notify_server"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/notify_server"></Button>
 </LinearLayout>