RedAnt Photo/res/layout/activity_locker.xml

@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
-            android:fontFamily="sans-serif-light"
+            
             android:text="@string/login_progress_signing_in"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>

RedAnt Photo/res/layout/activity_login.xml

@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
-            android:fontFamily="sans-serif-light"
+            
             android:text="@string/login_progress_signing_in"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>

RedAnt Photo/res/layout/activity_main1.xml

@@ -7,8 +7,9 @@
         android:id="@+id/rlside"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
+        android:layout_above="@+id/linearLayout1"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="0dp"
+        android:layout_marginRight="40dp"
         android:layout_marginTop="40dp" >
 
         <ImageButton
@@ -16,21 +17,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:layout_weight="1"
+            android:layout_centerHorizontal="true"
             android:background="@drawable/imagebutton"
             android:padding="0dp"
-            android:src="@drawable/apertureblack128" />
+            android:src="@drawable/ic_action_camera" />
 
         <ImageButton
             android:id="@+id/ibtnOk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:layout_weight="1"
             android:background="@drawable/imagebutton"
             android:padding="0dp"
-            android:src="@drawable/database_upload128"
-            android:text="Scan"
+            android:src="@drawable/ic_action_upload"
+            android:text="upload"
             android:visibility="invisible" />
 
         <ImageButton
@@ -38,10 +38,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_weight="1"
+            android:layout_centerHorizontal="true"
             android:background="@drawable/imagebutton"
             android:padding="0dp"
-            android:src="@drawable/barcode_scanner128"
+            android:src="@drawable/bar2"
             android:text="Scan" />
     </RelativeLayout>
 
@@ -70,7 +70,7 @@
             android:layout_gravity="bottom"
             android:layout_weight="0.1"
             android:gravity="right"
-            android:text="PID:"
+            android:text="PIID:"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <TextView
@@ -81,7 +81,6 @@
             android:layout_weight="1"
             android:textAppearance="?android:attr/textAppearanceLarge" >
         </TextView>
-
     </LinearLayout>
 
     <ImageView

RedAnt Photo/res/layout/activity_service_setting.xml

@@ -0,0 +1,62 @@
+<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="com.usai.redant.photo.ServerSettingActivity" >
+
+    <RadioGroup
+        android:id="@+id/radioGroup1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="3dp" >
+
+        <RadioButton
+            android:id="@+id/radio0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="Internal address" />
+
+        <EditText
+            android:id="@+id/et_ia"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:singleLine="true">
+
+            <requestFocus />
+        </EditText>
+
+        <RadioButton
+            android:id="@+id/radio1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="0dp"
+            android:text="External address" />
+
+        <EditText
+            android:id="@+id/et_ea"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/radioGroup1"
+            android:layout_below="@+id/radioGroup1"
+            android:ems="10"
+            android:singleLine="true" >
+        </EditText>
+    </RadioGroup>
+
+    <ImageButton
+        android:id="@+id/ibtn_scan"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/bar2" />
+
+</RelativeLayout>

RedAnt Photo/res/menu/about.xml

@@ -1,11 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.usai.redant.photo.AboutActivity" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

RedAnt Photo/res/menu/license.xml

@@ -1,11 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.usai.redant.photo.LicenseActivity" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

RedAnt Photo/res/menu/login.xml

@@ -4,5 +4,8 @@
         android:id="@+id/action_about"
         android:showAsAction="never"
         android:title="@string/action_about"/>
-
+    <item
+        android:id="@+id/action_server_settings"
+        android:showAsAction="never"
+        android:title="@string/action_server_settings"/>
 </menu>

RedAnt Photo/res/menu/main.xml

@@ -2,18 +2,19 @@
 
     <item
         android:id="@+id/action_clear"
-       
         android:showAsAction="never"
         android:title="@string/action_clear"/>
     <item
         android:id="@+id/action_type_pid"
-       
         android:showAsAction="never"
         android:title="@string/action_type_pid"/>
-     <item
+    <item
         android:id="@+id/action_view_queue"
-       
         android:showAsAction="never"
-        android:title="@string/action_view_queue"/>   
-    
-</menu>
+        android:title="@string/action_view_queue"/>
+    <item
+        android:id="@+id/action_server_settings"
+        android:showAsAction="never"
+        android:title="@string/action_server_settings"/>
+
+</menu>

RedAnt Photo/res/menu/main_activity1.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>

RedAnt Photo/res/menu/server_setting.xml

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

RedAnt Photo/res/values/strings.xml

@@ -2,29 +2,30 @@
 <resources>
 
     <string name="title_activity_login">Sign in</string>
-    <string name="title_activity_locker">Unlock Redant Photo</string>
+    <string name="title_activity_locker">Unlock ULS Photo</string>
 
     <!-- Strings related to login -->
     <string name="prompt_email">Email</string>
     <string name="prompt_Name">Name</string>
-    <string name="prompt_password">Password</string>
+    <string name="prompt_password">Password</string>   
     <string name="action_sign_in_register"><b>Sign in</b> or register</string>
     <string name="action_sign_in_short">Sign in</string>
     <string name="str_savepass">Save Password</string>
     <string name="action_about">About</string>
+    <string name="action_save">Save</string>
     <string name="action_forgot_password">Recover lost password</string>
     <string name="login_progress_signing_in">Signing in&#8230;</string>
     <string name="error_invalid_email">This email address is invalid</string>
     <string name="error_invalid_password">This password is too short</string>
     <string name="error_incorrect_password">Not authorized or wrong password</string>
     <string name="error_field_required">This field is required</string>
-    <string name="action_settings">Settings</string>
+    <string name="action_server_settings">Server Settings</string>
     <string name="action_clear">Clear</string>
     <string name="action_delete">Delete photo</string>
-    <string name="action_type_pid">Type PID</string>
+    <string name="action_type_pid">Type PIID</string>
     <string name="action_view_queue">View upload queue</string>
     <string name="preferences_name">Settings</string>
-    <string name="app_name">RedAnt Photo</string>
+    <string name="app_name">ULS Photo</string>
     <string name="button_ok">OK</string>
     <string name="title_activity_scan">ScanActivity</string>
     <string name="menu_help">Help</string>
@@ -74,5 +75,6 @@
     <string name="str_ver">ver:</string>
     <string name="title_activity_about">About</string>
     <string name="title_activity_license">License</string>
+    <string name="title_activity_service_setting">Server setting</string>
 
 </resources>