Apex/AndroidManifest.xml

@@ -43,11 +43,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="android.support.v4.app.FragmentActivity" />
 
-            <intent-filter>
+         <!--    <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter> 
+            </intent-filter>  -->
         </activity>
         <activity
             android:name="com.usai.apex.ApexActivity"

Apex/lint.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <issue id="ContentDescription" severity="ignore" />
     <issue id="HardcodedText">
         <ignore path="res/layout/fragment_direct_tracking.xml" />
     </issue>

Apex/res/layout-hdpi/activity_function_select.xml

@@ -1,69 +1,62 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-   
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true"
+    android:layout_centerHorizontal="true"
+    android:shrinkColumns="*"
     tools:context=".FunctionSelectActivity" >
 
-    <TableLayout
+    <TableRow
+        android:id="@+id/tableRow3"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-       android:shrinkColumns="*"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true" >
+        android:layout_height="wrap_content" >
 
-        <TableRow
-            android:id="@+id/tableRow3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
+        <ImageButton
+            android:id="@+id/ibtn_booking"
+            android:src="@drawable/ic_oceanbooking" />
 
-            <ImageButton
-                android:id="@+id/ibtn_booking"
-                android:src="@drawable/ic_oceanbooking" />
+        <ImageButton
+            android:id="@+id/ibtn_info"
+            android:src="@drawable/ic_ocean_blinfo" />
 
-            <ImageButton
-                android:id="@+id/ibtn_info"
-                android:src="@drawable/ic_ocean_blinfo" />
+        <ImageButton
+            android:id="@+id/ibtn_detail"
+            android:src="@drawable/ic_container_detail" />
+    </TableRow>
 
-            <ImageButton
-                android:id="@+id/ibtn_detail"
-                android:src="@drawable/ic_container_detail" />
-        </TableRow>
+    <TableRow
+        android:id="@+id/tableRow4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
 
-        <TableRow
-            android:id="@+id/tableRow4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
+        <ImageButton
+            android:id="@+id/ibtn_cargo"
+            android:src="@drawable/ic_cargo_tracking" />
 
-            <ImageButton
-                android:id="@+id/ibtn_cargo"
-                android:src="@drawable/ic_cargo_tracking" />
+        <ImageButton
+            android:id="@+id/ibtn_doc"
+            android:src="@drawable/ic_down_doc" />
 
-            <ImageButton
-                android:id="@+id/ibtn_doc"
-                android:src="@drawable/ic_down_doc" />
+        <ImageButton
+            android:id="@+id/ibtn_password"
+            android:src="@drawable/ic_password" />
+    </TableRow>
 
-            <ImageButton
-                android:id="@+id/ibtn_password"
-                android:src="@drawable/ic_password" />
-        </TableRow>
+    <TableRow
+        android:id="@+id/tableRow1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
 
-        <TableRow
-            android:id="@+id/tableRow1"
+        <ImageButton
+            android:id="@+id/ibtn_location"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-            <ImageButton
-                android:id="@+id/ibtn_location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_test" />
-            <ImageButton
-                android:id="@+id/ibtn_exit"
-                android:src="@drawable/ic_exit" />
-
-
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_test" />
 
-        </TableRow>
-    </TableLayout>
+        <ImageButton
+            android:id="@+id/ibtn_exit"
+            android:src="@drawable/ic_exit" />
+    </TableRow>
 
-</RelativeLayout>
+</TableLayout>

Apex/res/layout/activity_customize_fields.xml

@@ -2,44 +2,38 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
     tools:context=".CustomizeFieldsActivity" >
 
-    <com.usai.apex.DragListView   
-       android:id="@+id/drag_list"   
-       android:layout_width="fill_parent"   
-       android:layout_height="fill_parent"  
-       android:layout_above="@+id/foot"
-       android:cacheColorHint="#00000000"/>  
-<LinearLayout
+    <com.usai.apex.DragListView
+        android:id="@+id/drag_list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/foot"
+        android:cacheColorHint="#00000000" />
+
+    <LinearLayout
         android:id="@+id/foot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:orientation="vertical" >
+        android:orientation="horizontal" >
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <Button
+            android:id="@+id/btncancel"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal" >
+            android:layout_weight="1"
+            android:text="@android:string/cancel" />
 
-            <Button
-                android:id="@+id/btncancel"
-                style="?android:attr/buttonStyleSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@android:string/cancel" />
-
-            <Button
-                android:id="@+id/btnok"
-                style="?android:attr/buttonStyleSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@android:string/ok" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/btnok"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/ok" />
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>

Apex/res/layout/activity_function_select.xml

@@ -13,7 +13,8 @@
 
         <ImageButton
             android:id="@+id/ibtn_booking"
-            android:src="@drawable/ic_oceanbooking" />
+            android:src="@drawable/ic_oceanbooking"
+            android:contentDescription="" />
 
         <ImageButton
             android:id="@+id/ibtn_info"

Apex/res/layout/activity_location_detail.xml

@@ -14,74 +14,54 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        
         android:paddingBottom="10dp"
-        android:text="Apex Maritime Co., Inc."
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="name" 
+        />
 
     <TextView
-        android:id="@+id/tv_address"
+        android:id="@+id/tv_addr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:text="addr" 
+        android:padding="5dp"
         android:gravity="center"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="206 Utah Ave.\nSo. San Francisco, CA 94080"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        />
 
     <TextView
         android:id="@+id/tv_tel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:autoLink="phone"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="TEL: 650-589-2575"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:text="tel" 
+        android:autoLink="phone"/>
 
     <TextView
         android:id="@+id/tv_fax"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="FAX: 650-589-8861"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:text="fax" 
+        android:padding="5dp"
+        />
 
     <TextView
         android:id="@+id/tv_contact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="Contact: James Chu / Esther Hui"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/tv_email1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="email"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="E-mail: james.chu@apexshipping.com"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:text="contact"
+        android:gravity="center"
+        android:padding="5dp"
+         />
 
     <TextView
-        android:id="@+id/tv_email2"
+        android:id="@+id/tv_email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:text="email" 
         android:autoLink="email"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="E-mail: esther.hui@apexshipping.com"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp"
-        android:text="Add to contact" />
+        android:padding="5dp"
+        android:gravity="center"/>
 
 </LinearLayout>

Apex/res/layout/activity_test.xml

@@ -1,18 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".TestActivity" >
-
-  <fragment  
-        android:id="@+id/fragment1"  
-        android:name="com.usai.apex.LoginFragment"  
-        android:layout_width="fill_parent"  
-        android:layout_height="match_parent"  
-        />  
-
-</RelativeLayout>

Apex/res/layout/marker_info.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" 
+    android:gravity="center_horizontal">
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="title"
+        android:textStyle="bold"/>
+
+    <TextView
+        android:id="@+id/tv_snippet"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="info" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Click for more info"
+        android:textColor="#80808080" />
+
+</LinearLayout>

Apex/res/layout/result_item.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/tv_value"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:text="TextView" />
-
-</RelativeLayout>

Apex/res/layout/tab_indicator.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    
-
-</RelativeLayout>

Apex/res/menu/direct_tracking.xml

@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

Apex/res/menu/inner_map.xml

@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

Apex/res/menu/login.xml

@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_forgot_password"
-        android:showAsAction="never"
-        android:title="@string/action_forgot_password"/>
-
-</menu>

Apex/res/menu/main.xml

@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

Apex/res/menu/test.xml

@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

Apex/res/values/strings.xml

@@ -36,9 +36,10 @@
     <string name="title_activity_help">HelpActivity</string>
     <string name="title_activity_detail">DetailActivity</string>
     <string name="search">Search</string>
-
+    <!-- locations -->
+   
     <!-- test -->
-    <string name="url"><a href='http://www.google.com'>A1401330351H.pdf</a></string>
+    <string name="url"><a href="http://www.google.com">A1401330351H.pdf</a></string>
     <string name="link_text_manual"><b>text2: Explicit links using &lt;a&gt; markup.</b>      This has markup for a <a href="http://www.google.com">link</a> specified
       via an &lt;a&gt; tag.  Use a \"tel:\" URL
       to <a href="tel:4155551212">dial a phone number</a>.
</string>

Apex/src/com/usai/apex/LocationDetail.java

@@ -0,0 +1,29 @@
+package com.usai.apex;
+
+import java.io.Serializable;
+
+public class LocationDetail implements Serializable
+{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8043239175565480418L;
+	public String Name,Addr,Tel,Fax,Contact,Email;
+	LocationDetail(String name,String addr,String tel,String fax,String contact,String email)
+	{
+//		Name="aa";
+//		Addr="aa";
+//		Tel="aa";
+//		Fax="aa";
+//		Contact="aa";
+//		Email="aa";
+		Name=name;
+		Addr=addr;
+		Tel=tel;
+		Fax=fax;
+		Contact=contact;
+		Email=email;
+		
+	}
+
+}

Apex/src/com/usai/apex/LocationDetailActivity.java

@@ -2,16 +2,39 @@ package com.usai.apex;
 
 import android.os.Bundle;
 import android.app.Activity;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.Menu;
+import android.widget.TextView;
 
 public class LocationDetailActivity extends Activity
 {
+	LocationDetail detail;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_location_detail);
+		detail = (LocationDetail) getIntent().getSerializableExtra("detail");
+		TextView tv_name = (TextView) findViewById(R.id.tv_name);
+		tv_name.setText(detail.Name);
+//		tv_name.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView tv_addr = (TextView) findViewById(R.id.tv_addr);
+		tv_addr.setText(detail.Addr);
+//		tv_name.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView tv_tel = (TextView) findViewById(R.id.tv_tel);
+		tv_tel.setText(detail.Tel);
+//		tv_name.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView tv_fax = (TextView) findViewById(R.id.tv_fax);
+		tv_fax.setText(detail.Fax);
+//		tv_name.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView tv_contact = (TextView) findViewById(R.id.tv_contact);
+		tv_contact.setText(detail.Contact);
+//		tv_name.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView tv_email = (TextView) findViewById(R.id.tv_email);
+		tv_email.setText(detail.Email);
+//		tv_name.setMovementMethod(LinkMovementMethod.getInstance());
 	}
 
 	@Override