格式化xml

app/src/main/res/layout/add_bookmark.xml

@@ -1,10 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:orientation="horizontal" android:paddingLeft="6dp" android:paddingTop="5dp" android:paddingRight="6dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight">
-    <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-            <EditText android:textAppearance="?android:attr/textAppearanceMedium" android:id="@+id/add_bookmark_title" android:paddingRight="35dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:maxLines="1" android:singleLine="true"/>
-            <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_title_bookmark_btn" android:background="@drawable/clear_text" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingLeft="6dp"
+    android:paddingTop="5dp"
+    android:paddingRight="6dp"
+    android:paddingBottom="5dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:id="@+id/add_bookmark_title"
+                android:paddingRight="35dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:maxLines="1"
+                android:singleLine="true" />
+
+            <Button
+                android:textColor="@color/black"
+                android:gravity="right|center_vertical|center_horizontal|center"
+                android:layout_gravity="right|center_vertical|center_horizontal|center"
+                android:id="@+id/clear_title_bookmark_btn"
+                android:background="@drawable/clear_text"
+                android:visibility="gone"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginRight="5dp" />
         </FrameLayout>
-        <EditText android:enabled="false" android:textAppearance="?android:attr/textAppearanceSmall" android:ellipsize="end" android:id="@+id/add_bookmark_url" android:focusable="false" android:clickable="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:maxLines="1" android:singleLine="true" android:editable="false"/>
+
+        <EditText
+            android:enabled="false"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end"
+            android:id="@+id/add_bookmark_url"
+            android:focusable="false"
+            android:clickable="false"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:editable="false" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/ble_progress_layout.xml

@@ -1,8 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:orientation="vertical" android:id="@+id/linear_layout" android:padding="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="250dp">
-    <TextView android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_gravity="start" android:id="@+id/percent" android:paddingTop="10dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/printing"/>
-    <ProgressBar android:id="@+id/progress_percent" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" android:progress="0" style="?android:attr/progressBarStyleHorizontal"/>
-    <Space android:id="@+id/space_upper" android:visibility="gone" android:layout_width="match_parent" android:layout_height="25dp"/>
-    <ProgressBar android:layout_gravity="center" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <Space android:layout_width="match_parent" android:layout_height="25dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:id="@+id/linear_layout"
+    android:padding="10dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:minWidth="250dp">
+
+    <TextView
+        android:gravity="left|center_vertical|center_horizontal|center|start"
+        android:layout_gravity="start"
+        android:id="@+id/percent"
+        android:paddingTop="10dp"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/printing" />
+
+    <ProgressBar
+        android:id="@+id/progress_percent"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:progress="0"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <Space
+        android:id="@+id/space_upper"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="25dp" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:visibility="visible"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="25dp" />
 </LinearLayout>

app/src/main/res/layout/blocked_ip_error.xml

@@ -1,7 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:orientation="vertical" android:background="@android:color/white" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
-    <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:paddingLeft="40dp" android:paddingTop="10dp" android:paddingRight="40dp" android:paddingBottom="40dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:gravity="center_horizontal" android:id="@+id/stop_screen_txt" android:paddingBottom="20dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/blocked_ip_error_message" android:singleLine="false" style="@style/Theme.BoxSdk.Body"/>
-        <Button android:id="@+id/ok" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:text="@string/boxsdk_button_okay" style="@style/Theme.BoxSdk.Button"/>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:background="@android:color/white"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:paddingLeft="40dp"
+        android:paddingTop="10dp"
+        android:paddingRight="40dp"
+        android:paddingBottom="40dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:gravity="center_horizontal"
+            android:id="@+id/stop_screen_txt"
+            android:paddingBottom="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/blocked_ip_error_message"
+            android:singleLine="false"
+            style="@style/Theme.BoxSdk.Body" />
+
+        <Button
+            android:id="@+id/ok"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/boxsdk_button_okay"
+            style="@style/Theme.BoxSdk.Button" />
     </LinearLayout>
 </ScrollView>

app/src/main/res/layout/boxsdk_activity_oauth.xml

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/oauth_container" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.box.androidsdk.content.auth.OAuthWebView android:id="@+id/oauthview" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/oauth_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.box.androidsdk.content.auth.OAuthWebView
+        android:id="@+id/oauthview"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </FrameLayout>

app/src/main/res/layout/boxsdk_alert_dialog_text_entry.xml

@@ -1,7 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:filterTouchesWhenObscured="true">
-    <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="left" android:id="@+id/username_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:text="@string/boxsdk_alert_dialog_username"/>
-    <EditText android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="fill_horizontal" android:id="@+id/username_edit" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:hint="@string/boxsdk_alert_dialog_username" android:scrollHorizontally="true" android:inputType="textNoSuggestions"/>
-    <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="left" android:id="@+id/password_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:text="@string/boxsdk_alert_dialog_password"/>
-    <EditText android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="fill_horizontal" android:id="@+id/password_edit" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:hint="@string/boxsdk_alert_dialog_password" android:scrollHorizontally="true" android:inputType="textPassword"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:filterTouchesWhenObscured="true">
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="left"
+        android:id="@+id/username_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:text="@string/boxsdk_alert_dialog_username" />
+
+    <EditText
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="fill_horizontal"
+        android:id="@+id/username_edit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:hint="@string/boxsdk_alert_dialog_username"
+        android:scrollHorizontally="true"
+        android:inputType="textNoSuggestions" />
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="left"
+        android:id="@+id/password_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:text="@string/boxsdk_alert_dialog_password" />
+
+    <EditText
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="fill_horizontal"
+        android:id="@+id/password_edit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:hint="@string/boxsdk_alert_dialog_password"
+        android:scrollHorizontally="true"
+        android:inputType="textPassword" />
 </LinearLayout>

app/src/main/res/layout/boxsdk_avatar_item.xml

@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textAppearance="@style/Theme.BoxSdk.Subhead" android:gravity="center" android:layout_gravity="center" android:id="@+id/box_avatar_initials" android:layout_width="match_parent" android:layout_height="match_parent" android:textAllCaps="true" android:textAlignment="center"/>
-    <com.box.androidsdk.content.views.BezelImageView android:layout_gravity="center_vertical" android:id="@+id/box_avatar_image" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="centerCrop" android:layout_centerInParent="true" app:maskDrawable="@drawable/box_circle_mask"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textAppearance="@style/Theme.BoxSdk.Subhead"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/box_avatar_initials"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textAllCaps="true"
+        android:textAlignment="center" />
+
+    <com.box.androidsdk.content.views.BezelImageView
+        android:layout_gravity="center_vertical"
+        android:id="@+id/box_avatar_image"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:layout_centerInParent="true"
+        app:maskDrawable="@drawable/box_circle_mask" />
 </FrameLayout>

app/src/main/res/layout/boxsdk_choose_auth_activity.xml

@@ -1,8 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/box_background" android:layout_width="match_parent" android:layout_height="match_parent">
-    <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:background="@color/box_logo_background" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:layout_marginBottom="14dp" android:src="@drawable/boxlogo_white"/>
-        <TextView android:textSize="16sp" android:textColor="@color/box_logo_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:text="@string/boxsdk_Select_an_account_to_use"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/box_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:background="@color/box_logo_background"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="14dp"
+            android:src="@drawable/boxlogo_white" />
+
+        <TextView
+            android:textSize="16sp"
+            android:textColor="@color/box_logo_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp"
+            android:text="@string/boxsdk_Select_an_account_to_use" />
     </LinearLayout>
-    <ListView android:id="@+id/boxsdk_accounts_list" android:layout_width="match_parent" android:layout_height="match_parent" android:elevation="2dp"/>
+
+    <ListView
+        android:id="@+id/boxsdk_accounts_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:elevation="2dp" />
 </LinearLayout>

app/src/main/res/layout/boxsdk_list_item_account.xml

@@ -1,8 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="@dimen/collaboration_cell_height">
-    <com.box.androidsdk.content.views.BoxAvatarView android:textAppearance="@style/Theme.BoxSdk.Title" android:gravity="center" android:layout_gravity="center" android:id="@+id/box_account_initials" android:layout_width="@dimen/collaboration_thumb_size" android:layout_height="@dimen/collaboration_thumb_size" android:layout_marginLeft="@dimen/keyline_margin" android:layout_marginRight="@dimen/keyline_margin" android:textAllCaps="true" android:textAlignment="center"/>
-    <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-        <TextView android:textAppearance="@style/Theme.BoxSdk.Subhead" android:textColor="@color/box_primary_text" android:id="@+id/box_account_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-        <TextView android:textAppearance="@style/Theme.BoxSdk.Body" android:textColor="@color/box_hint_foreground" android:id="@+id/box_account_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:autoText="false"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/collaboration_cell_height">
+
+    <com.box.androidsdk.content.views.BoxAvatarView
+        android:textAppearance="@style/Theme.BoxSdk.Title"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/box_account_initials"
+        android:layout_width="@dimen/collaboration_thumb_size"
+        android:layout_height="@dimen/collaboration_thumb_size"
+        android:layout_marginLeft="@dimen/keyline_margin"
+        android:layout_marginRight="@dimen/keyline_margin"
+        android:textAllCaps="true"
+        android:textAlignment="center" />
+
+    <LinearLayout
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:textAppearance="@style/Theme.BoxSdk.Subhead"
+            android:textColor="@color/box_primary_text"
+            android:id="@+id/box_account_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true" />
+
+        <TextView
+            android:textAppearance="@style/Theme.BoxSdk.Body"
+            android:textColor="@color/box_hint_foreground"
+            android:id="@+id/box_account_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:autoText="false" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/boxsdk_list_item_new_account.xml

@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="@dimen/collaboration_cell_height">
-    <ImageView android:gravity="center" android:layout_gravity="center" android:layout_width="@dimen/collaboration_thumb_size" android:layout_height="@dimen/collaboration_thumb_size" android:layout_marginLeft="@dimen/keyline_margin" android:layout_marginRight="@dimen/keyline_margin" android:src="@drawable/ic_box_contentsdk_add_grey_24dp" android:scaleType="center"/>
-    <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-        <TextView android:textAppearance="@style/Theme.BoxSdk.Subhead" android:textColor="@color/box_primary_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/boxsdk_Use_a_different_account" android:singleLine="true"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/collaboration_cell_height">
+
+    <ImageView
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="@dimen/collaboration_thumb_size"
+        android:layout_height="@dimen/collaboration_thumb_size"
+        android:layout_marginLeft="@dimen/keyline_margin"
+        android:layout_marginRight="@dimen/keyline_margin"
+        android:src="@drawable/ic_box_contentsdk_add_grey_24dp"
+        android:scaleType="center" />
+
+    <LinearLayout
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:textAppearance="@style/Theme.BoxSdk.Subhead"
+            android:textColor="@color/box_primary_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/boxsdk_Use_a_different_account"
+            android:singleLine="true" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/choose_storage_server.xml

@@ -1,43 +1,281 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <LinearLayout android:orientation="vertical" android:id="@+id/save_to_local_section" android:background="@drawable/setting_border" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/local_memory" android:background="@drawable/choose_server" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/local_memory" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/save_to_local_section"
+                android:background="@drawable/setting_border"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/local_memory"
+                        android:background="@drawable/choose_server"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/local_memory"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
-                <View android:background="@drawable/list_divider" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/open_in" android:background="@drawable/choose_server" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/open_in" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+                <View
+                    android:background="@drawable/list_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/open_in"
+                        android:background="@drawable/choose_server"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/open_in"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/save_to_onlonestrage" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="20dp" android:layout_marginRight="5dp" android:layout_marginBottom="5dp">
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/box_net" android:background="@drawable/choose_server" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/box_net" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/box_net_next" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/save_to_onlonestrage"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginBottom="5dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/box_net"
+                        android:background="@drawable/choose_server"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/box_net"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/box_net_next"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
-                <View android:background="@drawable/list_divider" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/drop_box" android:background="@drawable/setting_border_1" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/drop_box" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/drop_box_next" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+                <View
+                    android:background="@drawable/list_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/drop_box"
+                        android:background="@drawable/setting_border_1"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/drop_box"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/drop_box_next"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
-                <View android:background="@drawable/list_divider" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/evernote" android:background="@drawable/setting_border_1" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/evernote" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/evernote_next" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+                <View
+                    android:background="@drawable/list_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/evernote"
+                        android:background="@drawable/setting_border_1"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/evernote"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/evernote_next"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
-                <View android:background="@drawable/list_divider" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/google_doc" android:background="@drawable/setting_border_1" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/google_drive" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/google_doc_next" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+                <View
+                    android:background="@drawable/list_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/google_doc"
+                        android:background="@drawable/setting_border_1"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/google_drive"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/google_doc_next"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
-                <View android:background="@drawable/list_divider" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <Button android:textSize="@dimen/choose_storage_btn_text_size" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/onedrive" android:background="@drawable/setting_border_1" android:paddingLeft="@dimen/choose_storage_btn_margin" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_width="match_parent" android:layout_height="45dp" android:layout_margin="0dp" android:text="@string/onedrive" android:layout_alignParentLeft="true" android:textAllCaps="false"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/onedrive_next" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+                <View
+                    android:background="@drawable/list_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:textSize="@dimen/choose_storage_btn_text_size"
+                        android:textStyle="bold"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/onedrive"
+                        android:background="@drawable/setting_border_1"
+                        android:paddingLeft="@dimen/choose_storage_btn_margin"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="45dp"
+                        android:layout_margin="0dp"
+                        android:text="@string/onedrive"
+                        android:layout_alignParentLeft="true"
+                        android:textAllCaps="false" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/onedrive_next"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true" />
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>

app/src/main/res/layout/com_customline_row.xml

@@ -1,6 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ImageView android:layout_gravity="left|center_vertical|center_horizontal|center" android:id="@+id/row_prefix_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_weight="0"/>
-    <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:id="@+id/row_list_area" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1"/>
-    <ImageView android:id="@+id/row_suffix_image" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_gravity="left|center_vertical|center_horizontal|center"
+        android:id="@+id/row_prefix_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_weight="0" />
+
+    <LinearLayout
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:id="@+id/row_list_area"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <ImageView
+        android:id="@+id/row_suffix_image"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginRight="5dp"
+        android:scaleType="fitXY"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true" />
 </LinearLayout>

app/src/main/res/layout/copy.xml

@@ -1,114 +1,793 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/copy" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <RadioGroup android:orientation="horizontal" android:id="@+id/copy_type_group" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/navigation_bar">
-        <RadioButton android:textSize="16sp" android:textColor="@drawable/printer_selector_text" android:gravity="center" android:id="@+id/normal_copy_tab" android:background="@drawable/printer_selector_background_local" android:padding="5dp" android:layout_width="0dp" android:layout_height="45dp" android:button="@null" android:text="@string/ECopyModeKeyNormal" android:layout_weight="1"/>
-        <RadioButton android:textSize="16sp" android:textColor="@drawable/printer_selector_text" android:gravity="center" android:id="@+id/repeat_copy_tab" android:background="@drawable/printer_selector_background_local" android:padding="5dp" android:layout_width="0dp" android:layout_height="45dp" android:button="@null" android:text="@string/ECopyModeKeyRepeat" android:layout_weight="1"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/copy"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <RadioGroup
+        android:orientation="horizontal"
+        android:id="@+id/copy_type_group"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/navigation_bar">
+
+        <RadioButton
+            android:textSize="16sp"
+            android:textColor="@drawable/printer_selector_text"
+            android:gravity="center"
+            android:id="@+id/normal_copy_tab"
+            android:background="@drawable/printer_selector_background_local"
+            android:padding="5dp"
+            android:layout_width="0dp"
+            android:layout_height="45dp"
+            android:button="@null"
+            android:text="@string/ECopyModeKeyNormal"
+            android:layout_weight="1" />
+
+        <RadioButton
+            android:textSize="16sp"
+            android:textColor="@drawable/printer_selector_text"
+            android:gravity="center"
+            android:id="@+id/repeat_copy_tab"
+            android:background="@drawable/printer_selector_background_local"
+            android:padding="5dp"
+            android:layout_width="0dp"
+            android:layout_height="45dp"
+            android:button="@null"
+            android:text="@string/ECopyModeKeyRepeat"
+            android:layout_weight="1" />
     </RadioGroup>
-    <ScrollView android:id="@+id/copy_main" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@+id/copy_ln_toolbar" android:layout_below="@+id/copy_type_group">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <LinearLayout android:orientation="vertical" android:id="@+id/copy_group1" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <FrameLayout android:orientation="horizontal" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="40dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/copy_copies"/>
-                    <LinearLayout android:layout_gravity="right" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="match_parent">
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/SettingButonCopiesCountDown" android:text="@string/copy_setting_label_countdown" style="@style/PlusMinusButton"/>
-                        <TextView android:textSize="17sp" android:textColor="@android:color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/SettingEditCopies" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:minWidth="30dp" android:text="1"/>
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/SettingButonCopiesCountUp" android:text="@string/copy_setting_label_countup" style="@style/PlusMinusButton"/>
+
+    <ScrollView
+        android:id="@+id/copy_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/copy_ln_toolbar"
+        android:layout_below="@+id/copy_type_group">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/copy_group1"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <FrameLayout
+                    android:orientation="horizontal"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/copy_copies" />
+
+                    <LinearLayout
+                        android:layout_gravity="right"
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/SettingButonCopiesCountDown"
+                            android:text="@string/copy_setting_label_countdown"
+                            style="@style/PlusMinusButton" />
+
+                        <TextView
+                            android:textSize="17sp"
+                            android:textColor="@android:color/black"
+                            android:gravity="right|center_vertical|center_horizontal|center"
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/SettingEditCopies"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
+                            android:minWidth="30dp"
+                            android:text="1" />
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/SettingButonCopiesCountUp"
+                            android:text="@string/copy_setting_label_countup"
+                            style="@style/PlusMinusButton" />
                     </LinearLayout>
                 </FrameLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/color" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/color"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/copy_color_info" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/color" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/color_next_screen_imv" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/color"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/color" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/copy_color_info"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/color"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/color_next_screen_imv"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/copy_group2" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <FrameLayout android:orientation="horizontal" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="40dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/copy_density"/>
-                    <LinearLayout android:layout_gravity="right" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="match_parent">
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/SettingButonXDensityCountDown" android:text="@string/density_setting_label_countdown" style="@style/PlusMinusButton"/>
-                        <ImageView android:id="@+id/density_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/plate_density05"/>
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/SettingButonXDensityCountUp" android:text="@string/density_setting_label_countup" style="@style/PlusMinusButton"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/copy_group2"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <FrameLayout
+                    android:orientation="horizontal"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/copy_density" />
+
+                    <LinearLayout
+                        android:layout_gravity="right"
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/SettingButonXDensityCountDown"
+                            android:text="@string/density_setting_label_countdown"
+                            style="@style/PlusMinusButton" />
+
+                        <ImageView
+                            android:id="@+id/density_image"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/plate_density05" />
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/SettingButonXDensityCountUp"
+                            android:text="@string/density_setting_label_countup"
+                            style="@style/PlusMinusButton" />
                     </LinearLayout>
                 </FrameLayout>
-                <View android:id="@+id/View01" android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/scale" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/copy_scale"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/copy_scale_info" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/XScale_Autofit" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/View01"
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/scale"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/copy_scale" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/copy_scale_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/XScale_Autofit"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/repeat_copy_layout" android:background="@drawable/select_setting_border" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/ECopyOptionItemKeyLayout"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/repeat_copy_layout_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/XScale_Autofit" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/repeat_copy_layout"
+                    android:background="@drawable/select_setting_border"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/ECopyOptionItemKeyLayout" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/repeat_copy_layout_value"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/XScale_Autofit"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/copy_group3" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp" android:layout_marginBottom="5dp">
-                <LinearLayout android:orientation="horizontal" android:id="@+id/paper_size" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/paper_size"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/copy_paper_size_info" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/EPS_MSID_A4" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/paper_size_next_screen_imv" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/copy_group3"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginBottom="5dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/paper_size"
+                    android:background="@drawable/setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/paper_size" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/copy_paper_size_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/EPS_MSID_A4"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/paper_size_next_screen_imv"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/paper_type" android:background="@drawable/setting_border_1" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/paper_type"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/copy_paper_type_info" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/EPS_MTID_PLAIN" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/paper_type_next_screen_imv" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/paper_type"
+                    android:background="@drawable/setting_border_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/paper_type" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/copy_paper_type_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/EPS_MTID_PLAIN"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/paper_type_next_screen_imv"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/paper_source" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/paper_source"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="left" android:id="@+id/copy_paper_source_info" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/EPS_MPID_FRONT2" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/paper_source_next_screen_imv" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/paper_source"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/paper_source" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:id="@+id/copy_paper_source_info"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/EPS_MPID_FRONT2"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/paper_source_next_screen_imv"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/document_type_separator" android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/document_type" android:background="@drawable/setting_border_1" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/document_type"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/copy_document_type_info" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/ScanContentType_Mixed" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/paper_type_next_screen_imv2" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/document_type_separator"
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/document_type"
+                    android:background="@drawable/setting_border_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/document_type" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/copy_document_type_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/ScanContentType_Mixed"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/paper_type_next_screen_imv2"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/quality" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/quality"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/copy_quality_info" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/EPS_MQID_STANDARD" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/quality_next_screen_imv" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/quality"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/quality" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/copy_quality_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/EPS_MQID_STANDARD"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/quality_next_screen_imv"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/remove_background_separator" android:background="@color/light" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/remove_background_layout" android:background="@drawable/select_setting_border" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/ECopyOptionItemKeyXRemoveBackground"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/remove_background_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/EPS_MQID_STANDARD" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/remove_background_next_icon" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/remove_background_separator"
+                    android:background="@color/light"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/remove_background_layout"
+                    android:background="@drawable/select_setting_border"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/ECopyOptionItemKeyXRemoveBackground" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/remove_background_value"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/EPS_MQID_STANDARD"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/remove_background_next_icon"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/copy_group4" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:layout_marginBottom="5dp">
-                <LinearLayout android:orientation="horizontal" android:id="@+id/print_cut_line_layout" android:background="@drawable/select_setting_border" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/ECopy_print_a_cut_line_option_key"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/print_cut_line_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/ECopy_print_a_cut_line_option_key_off_item" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/print_cut_line_next_icon" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/copy_group4"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginBottom="5dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/print_cut_line_layout"
+                    android:background="@drawable/select_setting_border"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/ECopy_print_a_cut_line_option_key" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/print_cut_line_value"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/ECopy_print_a_cut_line_option_key_off_item"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/print_cut_line_next_icon"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/print_cut_line_style_separator" android:background="@color/light" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/print_cut_line_style_layout" android:background="@drawable/select_setting_border" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/ECopy_line_style_option_key"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/print_cut_line_style_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/ECopyOptionItemChoiceXPrintCutLineStyle_Dash" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/print_cut_line_style_next_icon" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/print_cut_line_style_separator"
+                    android:background="@color/light"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/print_cut_line_style_layout"
+                    android:background="@drawable/select_setting_border"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/ECopy_line_style_option_key" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/print_cut_line_style_value"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/ECopyOptionItemChoiceXPrintCutLineStyle_Dash"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/print_cut_line_style_next_icon"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/print_cut_line_weight_separator" android:background="@color/light" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/print_cut_line_weight_layout" android:background="@drawable/select_setting_border" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/ECopy_line_width_option_key"/>
-                    <TextView android:textSize="17sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/print_cut_line_weight_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/ECopyOptionItemChoiceXPrintCutLineWeight_Dash" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/print_cut_line_weight_next_icon" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/print_cut_line_weight_separator"
+                    android:background="@color/light"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/print_cut_line_weight_layout"
+                    android:background="@drawable/select_setting_border"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/ECopy_line_width_option_key" />
+
+                    <TextView
+                        android:textSize="17sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/print_cut_line_weight_value"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/ECopyOptionItemChoiceXPrintCutLineWeight_Dash"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/print_cut_line_weight_next_icon"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/copy_ln_toolbar" style="@style/FunctionBar">
-        <LinearLayout android:gravity="left" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1">
-            <Button android:id="@+id/copy_setting_clear_all" android:text="@string/all_clear_setting" style="@style/FunctionButton.Normal"/>
+
+    <LinearLayout
+        android:id="@+id/copy_ln_toolbar"
+        style="@style/FunctionBar">
+
+        <LinearLayout
+            android:gravity="left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <Button
+                android:id="@+id/copy_setting_clear_all"
+                android:text="@string/all_clear_setting"
+                style="@style/FunctionButton.Normal" />
         </LinearLayout>
-        <LinearLayout android:gravity="right" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1">
-            <Button android:id="@+id/copy_button" android:text="@string/FunctionName_iPrint_Copy" style="@style/FunctionButton.Execute"/>
+
+        <LinearLayout
+            android:gravity="right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <Button
+                android:id="@+id/copy_button"
+                android:text="@string/FunctionName_iPrint_Copy"
+                style="@style/FunctionButton.Execute" />
         </LinearLayout>
     </LinearLayout>
-    <ProgressBar android:id="@+id/progressGetOption" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true"/>
+
+    <ProgressBar
+        android:id="@+id/progressGetOption"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
 </RelativeLayout>

app/src/main/res/layout/copy_custom_scale.xml

@@ -1,6 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent">
-    <Button android:id="@+id/SettingButonCopyMagnificationCountDown" android:text="@string/copy_setting_label_countdown" style="@style/PlusMinusButton"/>
-    <TextView android:textSize="20sp" android:textColor="@android:color/black" android:gravity="right" android:id="@+id/SettingCopyMagnification" android:background="@drawable/setting_border" android:padding="10dp" android:layout_width="60dp" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:minWidth="30dp" android:text="100"/>
-    <Button android:id="@+id/SettingButonCopyMagnificationCountUp" android:text="@string/copy_setting_label_countup" style="@style/PlusMinusButton"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/SettingButonCopyMagnificationCountDown"
+        android:text="@string/copy_setting_label_countdown"
+        style="@style/PlusMinusButton" />
+
+    <TextView
+        android:textSize="20sp"
+        android:textColor="@android:color/black"
+        android:gravity="right"
+        android:id="@+id/SettingCopyMagnification"
+        android:background="@drawable/setting_border"
+        android:padding="10dp"
+        android:layout_width="60dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:minWidth="30dp"
+        android:text="100" />
+
+    <Button
+        android:id="@+id/SettingButonCopyMagnificationCountUp"
+        android:text="@string/copy_setting_label_countup"
+        style="@style/PlusMinusButton" />
 </LinearLayout>

app/src/main/res/layout/copy_scale.xml

@@ -1,31 +1,196 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:id="@+id/copy_scale_group1" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-            <LinearLayout android:orientation="horizontal" android:id="@+id/full_size" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="40dp">
-                <TextView android:textSize="20dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:paddingLeft="5dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/XScale_FullSize"/>
-                <TextView android:textSize="20dp" android:textStyle="bold" android:gravity="right|center_vertical|center_horizontal|center" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="@string/hundred_percent" android:layout_weight="0.36"/>
-                <ImageView android:gravity="center_vertical" android:id="@+id/full_select_icon" android:visibility="gone" android:layout_width="30dp" android:layout_height="match_parent" android:src="@drawable/selected"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/copy_scale_group1"
+            android:background="@drawable/setting_border"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp">
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:id="@+id/full_size"
+                android:background="@drawable/select_setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="40dp">
+
+                <TextView
+                    android:textSize="20dp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="left"
+                    android:paddingLeft="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/XScale_FullSize" />
+
+                <TextView
+                    android:textSize="20dp"
+                    android:textStyle="bold"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="5dp"
+                    android:text="@string/hundred_percent"
+                    android:layout_weight="0.36" />
+
+                <ImageView
+                    android:gravity="center_vertical"
+                    android:id="@+id/full_select_icon"
+                    android:visibility="gone"
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/selected" />
             </LinearLayout>
         </LinearLayout>
-        <LinearLayout android:orientation="vertical" android:id="@+id/copy_scale_group2" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-            <LinearLayout android:orientation="horizontal" android:id="@+id/auto_fit" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="40dp">
-                <TextView android:textSize="20dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:paddingLeft="5dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/XScale_Autofit"/>
-                <TextView android:textSize="20dp" android:textStyle="bold" android:gravity="right|center_vertical|center_horizontal|center" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:text="----" android:layout_weight="0.36"/>
-                <ImageView android:gravity="center_vertical" android:id="@+id/auto_select_icon" android:visibility="gone" android:layout_width="30dp" android:layout_height="match_parent" android:src="@drawable/selected"/>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/copy_scale_group2"
+            android:background="@drawable/setting_border"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp">
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:id="@+id/auto_fit"
+                android:background="@drawable/select_setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="40dp">
+
+                <TextView
+                    android:textSize="20dp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="left"
+                    android:paddingLeft="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/XScale_Autofit" />
+
+                <TextView
+                    android:textSize="20dp"
+                    android:textStyle="bold"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="5dp"
+                    android:text="----"
+                    android:layout_weight="0.36" />
+
+                <ImageView
+                    android:gravity="center_vertical"
+                    android:id="@+id/auto_select_icon"
+                    android:visibility="gone"
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/selected" />
             </LinearLayout>
         </LinearLayout>
-        <View android:background="@color/all_black" android:layout_width="wrap_content" android:layout_height="1dp" android:layout_marginLeft="5dp" android:layout_marginTop="10dp" android:layout_marginRight="5dp"/>
-        <LinearLayout android:orientation="vertical" android:id="@+id/copy_scale_group3" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="10dp" android:layout_marginRight="5dp">
-            <LinearLayout android:orientation="horizontal" android:id="@+id/copy_scale_custom" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="40dp" android:layout_marginRight="5dp">
-                <TextView android:textSize="20dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:paddingLeft="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/XScale_Custom" android:layout_centerVertical="true"/>
-                <TextView android:textSize="17sp" android:textColor="@android:color/black" android:gravity="right|center_vertical|center_horizontal|center" android:id="@+id/CopyMagnification" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="5dp" android:minWidth="30dp" android:text="100" android:layout_weight="0.36"/>
-                <ImageView android:gravity="center_vertical" android:id="@+id/custom_select_icon" android:visibility="gone" android:layout_width="30dp" android:layout_height="match_parent" android:src="@drawable/selected"/>
+
+        <View
+            android:background="@color/all_black"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="5dp" />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/copy_scale_group3"
+            android:background="@drawable/setting_border"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="5dp">
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:id="@+id/copy_scale_custom"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginRight="5dp">
+
+                <TextView
+                    android:textSize="20dp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/XScale_Custom"
+                    android:layout_centerVertical="true" />
+
+                <TextView
+                    android:textSize="17sp"
+                    android:textColor="@android:color/black"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:id="@+id/CopyMagnification"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="5dp"
+                    android:minWidth="30dp"
+                    android:text="100"
+                    android:layout_weight="0.36" />
+
+                <ImageView
+                    android:gravity="center_vertical"
+                    android:id="@+id/custom_select_icon"
+                    android:visibility="gone"
+                    android:layout_width="30dp"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/selected" />
             </LinearLayout>
         </LinearLayout>
-        <FrameLayout android:id="@+id/scale_fl_list" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp" android:layout_marginBottom="5dp">
-            <ListView android:id="@+id/scale_list" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="match_parent" android:cacheColorHint="#00000000" android:divider="@color/light" android:dividerHeight="1dp" android:fadeScrollbars="true"/>
+
+        <FrameLayout
+            android:id="@+id/scale_fl_list"
+            android:background="@drawable/setting_border"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp">
+
+            <ListView
+                android:id="@+id/scale_list"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:cacheColorHint="#00000000"
+                android:divider="@color/light"
+                android:dividerHeight="1dp"
+                android:fadeScrollbars="true" />
         </FrameLayout>
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/copy_setting.xml

@@ -1,7 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <FrameLayout android:id="@+id/fl_list" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="5dp" android:layout_marginTop="2dp" android:layout_marginRight="5dp">
-        <ListView android:id="@+id/copy_setting_list" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:cacheColorHint="#00000000" android:divider="@color/light" android:dividerHeight="1dp" android:fadeScrollbars="true"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <FrameLayout
+        android:id="@+id/fl_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginRight="5dp">
+
+        <ListView
+            android:id="@+id/copy_setting_list"
+            android:background="@drawable/setting_border"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:cacheColorHint="#00000000"
+            android:divider="@color/light"
+            android:dividerHeight="1dp"
+            android:fadeScrollbars="true" />
     </FrameLayout>
 </LinearLayout>

app/src/main/res/layout/device_information.xml

@@ -1,62 +1,395 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:id="@+id/scroll" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <View android:layout_width="match_parent" android:layout_height="20dp"/>
-                <TextView android:textSize="17dp" android:textColor="@android:color/darker_gray" android:id="@+id/tv_terminalInformation" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:text="@string/str_deviceInformation_DeviceInformation"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:id="@+id/scroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:paddingBottom="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp" />
+
+                <TextView
+                    android:textSize="17dp"
+                    android:textColor="@android:color/darker_gray"
+                    android:id="@+id/tv_terminalInformation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:text="@string/str_deviceInformation_DeviceInformation" />
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/DeviceGrubLinearLayout01" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutOSVersion" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_OSVersion"/>
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_deviceOSVersion" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-" android:layout_weight="1"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/DeviceGrubLinearLayout01"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/linearLayoutOSVersion"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/str_deviceInformation_OSVersion" />
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/tv_deviceOSVersion"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="8dp"
+                        android:text="-"
+                        android:layout_weight="1" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutWifiState" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_WifiState"/>
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_deviceWifiState" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-" android:layout_weight="1"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/linearLayoutWifiState"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/str_deviceInformation_WifiState" />
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/tv_deviceWifiState"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="8dp"
+                        android:text="-"
+                        android:layout_weight="1" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutSSIDName" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_SSIDName"/>
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_deviceSSIDName" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-" android:layout_weight="1"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/linearLayoutSSIDName"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/str_deviceInformation_SSIDName" />
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/tv_deviceSSIDName"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="8dp"
+                        android:text="-"
+                        android:layout_weight="1" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutIPAddress" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_IPAddress"/>
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_deviceIPAddress" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-.-.-.-" android:layout_weight="1"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/linearLayoutIPAddress"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/str_deviceInformation_IPAddress" />
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/tv_deviceIPAddress"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="8dp"
+                        android:text="-.-.-.-"
+                        android:layout_weight="1" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutBluetoothStatus" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_BluetoothStatus"/>
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_deviceBluetoothStatus" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-" android:layout_weight="1"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/linearLayoutBluetoothStatus"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/str_deviceInformation_BluetoothStatus" />
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/tv_deviceBluetoothStatus"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="8dp"
+                        android:text="-"
+                        android:layout_weight="1" />
                 </LinearLayout>
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <View android:id="@+id/view2" android:layout_width="match_parent" android:layout_height="20dp"/>
-                <TextView android:textSize="17dp" android:textColor="@android:color/darker_gray" android:id="@+id/tv_devicePrinterInformation" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:text="@string/str_deviceInformation_PrinterInformation"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <View
+                    android:id="@+id/view2"
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp" />
+
+                <TextView
+                    android:textSize="17dp"
+                    android:textColor="@android:color/darker_gray"
+                    android:id="@+id/tv_devicePrinterInformation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:text="@string/str_deviceInformation_PrinterInformation" />
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/DeviceGrubLinearLayout02" android:background="@drawable/setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutPrinterName" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_PrinterName"/>
-                    <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_devicePrinterName" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-" android:layout_weight="1"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/DeviceGrubLinearLayout02"
+                android:background="@drawable/setting_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/linearLayoutPrinterName"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="8dp"
+                        android:text="@string/str_deviceInformation_PrinterName" />
+
+                    <TextView
+                        android:textSize="17dp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/tv_devicePrinterName"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="8dp"
+                        android:text="-"
+                        android:layout_weight="1" />
                 </LinearLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <LinearLayout android:orientation="vertical" android:id="@+id/linearLayoutStatusAndIP" android:layout_width="match_parent" android:layout_height="wrap_content">
-                        <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutPrinterStatus" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="45dp">
-                            <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:id="@+id/tv_devicePrinterStatusInfo" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_PrinterStatus"/>
-                            <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_devicePrinterStatus" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="8dp" android:text="-" android:layout_weight="1"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:id="@+id/linearLayoutStatusAndIP"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:id="@+id/linearLayoutPrinterStatus"
+                            android:background="@drawable/select_setting_border"
+                            android:layout_width="match_parent"
+                            android:layout_height="45dp">
+
+                            <TextView
+                                android:textSize="17dp"
+                                android:textStyle="bold"
+                                android:textColor="@android:color/black"
+                                android:gravity="center_vertical"
+                                android:layout_gravity="left"
+                                android:id="@+id/tv_devicePrinterStatusInfo"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="8dp"
+                                android:text="@string/str_deviceInformation_PrinterStatus" />
+
+                            <TextView
+                                android:textSize="17dp"
+                                android:textStyle="bold"
+                                android:textColor="@android:color/darker_gray"
+                                android:gravity="right|center_vertical|center_horizontal|center"
+                                android:layout_gravity="right"
+                                android:id="@+id/tv_devicePrinterStatus"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="8dp"
+                                android:text="-"
+                                android:layout_weight="1" />
                         </LinearLayout>
-                        <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                        <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayoutPrinterIPAddress" android:background="@drawable/setting_border_1" android:layout_width="match_parent" android:layout_height="45dp">
-                            <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:id="@+id/tv_devicePrinterIPAddressInfo" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_PrinterIPAddress"/>
-                            <TextView android:textSize="17dp" android:textStyle="bold" android:textColor="@android:color/darker_gray" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/tv_devicePrinterIPAddress" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="8dp" android:text="-.-.-.-" android:layout_weight="1"/>
+
+                        <View
+                            android:background="@color/light"
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp" />
+
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:id="@+id/linearLayoutPrinterIPAddress"
+                            android:background="@drawable/setting_border_1"
+                            android:layout_width="match_parent"
+                            android:layout_height="45dp">
+
+                            <TextView
+                                android:textSize="17dp"
+                                android:textStyle="bold"
+                                android:textColor="@android:color/black"
+                                android:gravity="center_vertical"
+                                android:layout_gravity="left"
+                                android:id="@+id/tv_devicePrinterIPAddressInfo"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="8dp"
+                                android:text="@string/str_deviceInformation_PrinterIPAddress" />
+
+                            <TextView
+                                android:textSize="17dp"
+                                android:textStyle="bold"
+                                android:textColor="@android:color/darker_gray"
+                                android:gravity="right|center_vertical|center_horizontal|center"
+                                android:layout_gravity="right"
+                                android:id="@+id/tv_devicePrinterIPAddress"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="2dp"
+                                android:layout_marginRight="8dp"
+                                android:text="-.-.-.-"
+                                android:layout_weight="1" />
                         </LinearLayout>
                     </LinearLayout>
-                    <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
-                        <ProgressBar android:id="@+id/progress_status" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
+                    <LinearLayout
+                        android:gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true">
+
+                        <ProgressBar
+                            android:id="@+id/progress_status"
+                            android:visibility="gone"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>

app/src/main/res/layout/dialog_custom_layout01.xml

@@ -1,11 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/all_white" android:padding="12dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="18sp" android:textStyle="bold" android:id="@+id/title_text" android:padding="15dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/EPS_ERR_PRINTER_NOT_FOUND_TITLE"/>
-    <ScrollView android:id="@+id/main_view" android:layout_width="match_parent" android:layout_height="0dp" android:fillViewport="false" android:layout_weight="1">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textSize="14sp" android:id="@+id/message_text" android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/EPS_PRNERR_COMM1"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/all_white"
+    android:padding="12dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:id="@+id/title_text"
+        android:padding="15dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/EPS_ERR_PRINTER_NOT_FOUND_TITLE" />
+
+    <ScrollView
+        android:id="@+id/main_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:fillViewport="false"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textSize="14sp"
+                android:id="@+id/message_text"
+                android:padding="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/EPS_PRNERR_COMM1" />
         </LinearLayout>
     </ScrollView>
-    <Button android:id="@+id/browse_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="15dp" android:layout_marginRight="15dp" android:layout_marginBottom="0dp" android:text="@string/browse_site" android:layout_marginStart="15dp" android:layout_marginEnd="15dp"/>
-    <Button android:id="@+id/close_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="0dp" android:layout_marginRight="15dp" android:layout_marginBottom="15dp" android:text="@string/str_btn_close" android:layout_marginStart="15dp" android:layout_marginEnd="15dp"/>
+
+    <Button
+        android:id="@+id/browse_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="0dp"
+        android:text="@string/browse_site"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp" />
+
+    <Button
+        android:id="@+id/close_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/str_btn_close"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp" />
 </LinearLayout>

app/src/main/res/layout/dialog_epsonconnect.xml

@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:textSize="18sp" android:textStyle="bold" android:gravity="center_horizontal" android:id="@+id/epsonconnect_title_tv" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/ec_registration_dialog_title"/>
-    <TextView android:textSize="18sp" android:gravity="center_horizontal" android:id="@+id/epsonconnect_msg_tv" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/ec_registration_dialog_msg"/>
-    <TextView android:textSize="16sp" android:gravity="center_horizontal" android:id="@+id/epsonconnect_sub_msg_tv" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@string/ec_registration_dialog_sub_msg"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="15dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:gravity="center_horizontal"
+        android:id="@+id/epsonconnect_title_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/ec_registration_dialog_title" />
+
+    <TextView
+        android:textSize="18sp"
+        android:gravity="center_horizontal"
+        android:id="@+id/epsonconnect_msg_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/ec_registration_dialog_msg" />
+
+    <TextView
+        android:textSize="16sp"
+        android:gravity="center_horizontal"
+        android:id="@+id/epsonconnect_sub_msg_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:text="@string/ec_registration_dialog_sub_msg" />
 </LinearLayout>

app/src/main/res/layout/dialog_inkrpln_invitation.xml

@@ -1,12 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:padding="15dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="24sp" android:textStyle="bold" android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/readyink_invitation_title"/>
-    <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textSize="20sp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginBottom="20dp" android:text="@string/readyink_invitation_description"/>
-            <Button android:id="@+id/button1" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_yes" android:textAllCaps="false"/>
-            <Button android:id="@+id/button2" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_no" android:textAllCaps="false"/>
-            <Button android:id="@+id/button3" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/donot_show_again" android:textAllCaps="false"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="15dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:gravity="center_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/readyink_invitation_title" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textSize="20sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                android:text="@string/readyink_invitation_description" />
+
+            <Button
+                android:id="@+id/button1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_yes"
+                android:textAllCaps="false" />
+
+            <Button
+                android:id="@+id/button2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_no"
+                android:textAllCaps="false" />
+
+            <Button
+                android:id="@+id/button3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/donot_show_again"
+                android:textAllCaps="false" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

app/src/main/res/layout/dialog_local_prgress.xml

@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:padding="18dp" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <ProgressBar android:layout_gravity="center_vertical" android:layout_width="48dp" android:layout_height="48dp" android:layout_margin="10dp"/>
-    <TextView android:textSize="18sp" android:layout_gravity="center_vertical" android:id="@+id/messageText" android:padding="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:padding="18dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ProgressBar
+        android:layout_gravity="center_vertical"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_margin="10dp" />
+
+    <TextView
+        android:textSize="18sp"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/messageText"
+        android:padding="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </LinearLayout>

app/src/main/res/layout/dialog_nozzle_check_guidance.xml

@@ -1,15 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ScrollView android:id="@+id/main_view" android:layout_width="match_parent" android:layout_height="0dp" android:fillViewport="false" android:layout_weight="1">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textStyle="bold" android:id="@+id/topText" android:padding="15dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/nozzle_check_guidance_title"/>
-            <LinearLayout android:orientation="horizontal" android:id="@+id/image_layout" android:paddingTop="10dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:gravity="center_horizontal" android:id="@+id/ok_text" android:paddingLeft="10dp" android:paddingTop="5dp" android:paddingRight="10dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/nozzle_check_guidance_ok_text" android:drawableTop="@drawable/nozzle_ok" android:drawablePadding="5dp" android:layout_weight="1" android:paddingStart="10dp" android:paddingEnd="10dp"/>
-                <TextView android:gravity="center_horizontal" android:id="@+id/ng_text" android:paddingLeft="10dp" android:paddingTop="5dp" android:paddingRight="10dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/nozzle_check_guidance_ng_text" android:drawableTop="@drawable/nozzle_ng" android:drawablePadding="5dp" android:layout_weight="1" android:paddingStart="10dp" android:paddingEnd="10dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/all_white"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:id="@+id/main_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:fillViewport="false"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textStyle="bold"
+                android:id="@+id/topText"
+                android:padding="15dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/nozzle_check_guidance_title" />
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:id="@+id/image_layout"
+                android:paddingTop="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:gravity="center_horizontal"
+                    android:id="@+id/ok_text"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="5dp"
+                    android:paddingRight="10dp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/nozzle_check_guidance_ok_text"
+                    android:drawableTop="@drawable/nozzle_ok"
+                    android:drawablePadding="5dp"
+                    android:layout_weight="1"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp" />
+
+                <TextView
+                    android:gravity="center_horizontal"
+                    android:id="@+id/ng_text"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="5dp"
+                    android:paddingRight="10dp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/nozzle_check_guidance_ng_text"
+                    android:drawableTop="@drawable/nozzle_ng"
+                    android:drawablePadding="5dp"
+                    android:layout_weight="1"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp" />
             </LinearLayout>
-            <TextView android:id="@+id/lowerText" android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/nozzle_check_guidance_message"/>
+
+            <TextView
+                android:id="@+id/lowerText"
+                android:padding="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/nozzle_check_guidance_message" />
         </LinearLayout>
     </ScrollView>
-    <Button android:id="@+id/browse_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="15dp" android:layout_marginRight="15dp" android:layout_marginBottom="0dp" android:text="@string/browse_site" android:layout_marginStart="15dp" android:layout_marginEnd="15dp"/>
-    <Button android:id="@+id/close_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="0dp" android:layout_marginRight="15dp" android:layout_marginBottom="15dp" android:text="@string/str_btn_close" android:layout_marginStart="15dp" android:layout_marginEnd="15dp"/>
+
+    <Button
+        android:id="@+id/browse_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="0dp"
+        android:text="@string/browse_site"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp" />
+
+    <Button
+        android:id="@+id/close_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/str_btn_close"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp" />
 </LinearLayout>

app/src/main/res/layout/dialog_progress.xml

@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <ProgressBar android:theme="@style/CircularProgress" android:id="@+id/dialog_progress_id" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" style="@style/Widget.AppCompat.ProgressBar"/>
-    <TextView android:id="@+id/dialog_progress_text_bottom" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_wait" android:layout_below="@+id/dialog_progress_id" android:layout_centerHorizontal="true"/>
-    <TextView android:id="@+id/dialog_progress_text_right" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_wait" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toEndOf="@+id/dialog_progress_id"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="8dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ProgressBar
+        android:theme="@style/CircularProgress"
+        android:id="@+id/dialog_progress_id"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        style="@style/Widget.AppCompat.ProgressBar" />
+
+    <TextView
+        android:id="@+id/dialog_progress_text_bottom"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/str_wait"
+        android:layout_below="@+id/dialog_progress_id"
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:id="@+id/dialog_progress_text_right"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/str_wait"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@+id/dialog_progress_id" />
 </RelativeLayout>

app/src/main/res/layout/dialog_progress_wifi_direct.xml

@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <ProgressBar android:theme="@style/CircularProgress" android:id="@+id/dialog_progress_id" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" style="@style/Widget.AppCompat.ProgressBar"/>
-    <TextView android:id="@+id/dialog_progress_text_bottom" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_no_wifi" android:layout_below="@+id/dialog_progress_id" android:layout_centerHorizontal="true"/>
-    <TextView android:id="@+id/dialog_progress_text_right" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_no_wifi" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toEndOf="@+id/dialog_progress_id"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="8dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ProgressBar
+        android:theme="@style/CircularProgress"
+        android:id="@+id/dialog_progress_id"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        style="@style/Widget.AppCompat.ProgressBar" />
+
+    <TextView
+        android:id="@+id/dialog_progress_text_bottom"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/str_no_wifi"
+        android:layout_below="@+id/dialog_progress_id"
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:id="@+id/dialog_progress_text_right"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/str_no_wifi"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@+id/dialog_progress_id" />
 </RelativeLayout>

app/src/main/res/layout/dialog_scan_continue_confirmation.xml

@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:textSize="24sp" android:textStyle="bold" android:gravity="center_horizontal" android:id="@+id/scanContinue_title_tv" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/scan_dialog_title"/>
-    <TextView android:textSize="20sp" android:gravity="center_horizontal" android:id="@+id/scanContinue_msg_tv" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/scan_dialog_message"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="15dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:gravity="center_horizontal"
+        android:id="@+id/scanContinue_title_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/scan_dialog_title" />
+
+    <TextView
+        android:textSize="20sp"
+        android:gravity="center_horizontal"
+        android:id="@+id/scanContinue_msg_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/scan_dialog_message" />
 </LinearLayout>

app/src/main/res/layout/dialog_three_button.xml

@@ -1,10 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:padding="15dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="24sp" android:textStyle="bold" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="sample title"/>
-    <TextView android:textSize="20sp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="Three button dialog\10yes/no/never"/>
-    <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <Button android:id="@+id/button1" android:layout_width="0dp" android:layout_height="wrap_content" android:text="No" android:layout_weight="1"/>
-        <Button android:id="@+id/button2" android:layout_width="0dp" android:layout_height="wrap_content" android:text="Yes" android:layout_weight="1"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="15dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="sample title" />
+
+    <TextView
+        android:textSize="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:text="Three button dialog\10yes/no/never" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/button1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="No"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="Yes"
+            android:layout_weight="1" />
     </LinearLayout>
-    <Button android:id="@+id/button3" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Never"/>
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Never" />
 </LinearLayout>

app/src/main/res/layout/dlg_mes_checkbox.xml

@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/layout_root" android:layout_width="match_parent" android:layout_height="match_parent">
-    <CheckBox android:id="@+id/checkBox1" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:id="@+id/layout_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <CheckBox
+        android:id="@+id/checkBox1"
+        android:clickable="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp" />
 </LinearLayout>

app/src/main/res/layout/doc_print_preview.xml

@@ -1,31 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-        <include layout="@layout/navigationbar"/>
-        <RelativeLayout android:id="@+id/rl_zoomview" android:background="@color/background_preview" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-            <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@+id/ln_zoomview" android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerInParent="true">
-                <ImageView android:id="@+id/zoomview" android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitCenter"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/navigationbar" />
+
+        <RelativeLayout
+            android:id="@+id/rl_zoomview"
+            android:background="@color/background_preview"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:gravity="center"
+                android:orientation="vertical"
+                android:id="@+id/ln_zoomview"
+                android:background="@color/all_white"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true">
+
+                <ImageView
+                    android:id="@+id/zoomview"
+                    android:background="@color/all_white"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="fitCenter" />
             </LinearLayout>
-            <LinearLayout android:gravity="center" android:id="@+id/ln_pre" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true">
-                <Button android:id="@+id/btn_pre" android:background="@drawable/bt_left" android:layout_width="30dp" android:layout_height="90dp"/>
+
+            <LinearLayout
+                android:gravity="center"
+                android:id="@+id/ln_pre"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentLeft="true">
+
+                <Button
+                    android:id="@+id/btn_pre"
+                    android:background="@drawable/bt_left"
+                    android:layout_width="30dp"
+                    android:layout_height="90dp" />
             </LinearLayout>
-            <LinearLayout android:gravity="center" android:id="@+id/ln_next" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true">
-                <Button android:id="@+id/btn_next" android:background="@drawable/bt_right_1" android:layout_width="30dp" android:layout_height="90dp"/>
+
+            <LinearLayout
+                android:gravity="center"
+                android:id="@+id/ln_next"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true">
+
+                <Button
+                    android:id="@+id/btn_next"
+                    android:background="@drawable/bt_right_1"
+                    android:layout_width="30dp"
+                    android:layout_height="90dp" />
             </LinearLayout>
-            <LinearLayout android:gravity="right|center_vertical|center_horizontal|center" android:id="@+id/pagebar_top" android:layout_width="match_parent" android:layout_height="50dp">
-                <ImageView android:id="@+id/icon_papermissmatch" android:background="@drawable/ic_exclamation" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp"/>
-                <TextView android:textSize="15sp" android:textStyle="bold" android:textColor="@color/epson_blue" android:id="@+id/tv_page_size" android:background="@drawable/text_view_boder" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="5dp" android:text="@string/size"/>
+
+            <LinearLayout
+                android:gravity="right|center_vertical|center_horizontal|center"
+                android:id="@+id/pagebar_top"
+                android:layout_width="match_parent"
+                android:layout_height="50dp">
+
+                <ImageView
+                    android:id="@+id/icon_papermissmatch"
+                    android:background="@drawable/ic_exclamation"
+                    android:visibility="gone"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp" />
+
+                <TextView
+                    android:textSize="15sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/epson_blue"
+                    android:id="@+id/tv_page_size"
+                    android:background="@drawable/text_view_boder"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dp"
+                    android:text="@string/size" />
             </LinearLayout>
-            <RelativeLayout android:gravity="center_vertical" android:id="@+id/pagebar_bottom" android:paddingLeft="10dp" android:paddingRight="10dp" android:layout_width="match_parent" android:layout_height="50dp" android:layout_alignParentBottom="true">
-                <TextView android:textSize="15sp" android:textStyle="bold" android:textColor="@color/all_black" android:id="@+id/tv_page_num" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/page"/>
+
+            <RelativeLayout
+                android:gravity="center_vertical"
+                android:id="@+id/pagebar_bottom"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true">
+
+                <TextView
+                    android:textSize="15sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/all_black"
+                    android:id="@+id/tv_page_num"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/page" />
             </RelativeLayout>
-            <TextView android:textSize="17sp" android:textColor="@color/black" android:gravity="center" android:id="@+id/textViewNoPreviewMsg" android:padding="5dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/str_msg_document_preview_viewbase"/>
+
+            <TextView
+                android:textSize="17sp"
+                android:textColor="@color/black"
+                android:gravity="center"
+                android:id="@+id/textViewNoPreviewMsg"
+                android:padding="5dp"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/str_msg_document_preview_viewbase" />
         </RelativeLayout>
-        <RelativeLayout android:orientation="horizontal" android:id="@+id/toolbar" style="@style/FunctionBar">
-            <Button android:id="@+id/btn_print" android:text="@string/str_print" android:layout_alignParentRight="true" style="@style/FunctionButton.Execute"/>
+
+        <RelativeLayout
+            android:orientation="horizontal"
+            android:id="@+id/toolbar"
+            style="@style/FunctionBar">
+
+            <Button
+                android:id="@+id/btn_print"
+                android:text="@string/str_print"
+                android:layout_alignParentRight="true"
+                style="@style/FunctionButton.Execute" />
         </RelativeLayout>
     </LinearLayout>
-    <RelativeLayout android:gravity="center" android:orientation="vertical" android:id="@+id/progress" android:visibility="gone" style="@style/CoverProgress">
-        <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true"/>
+
+    <RelativeLayout
+        android:gravity="center"
+        android:orientation="vertical"
+        android:id="@+id/progress"
+        android:visibility="gone"
+        style="@style/CoverProgress">
+
+        <ProgressBar
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
     </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/edit_bookmark.xml

@@ -1,8 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-        <EditText android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="fill_horizontal" android:id="@+id/name" android:paddingRight="35dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollHorizontally="true" android:capitalize="none" android:autoText="false"/>
-        <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_title_btn" android:background="@drawable/clear_text" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="fill_horizontal"
+            android:id="@+id/name"
+            android:paddingRight="35dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollHorizontally="true"
+            android:capitalize="none"
+            android:autoText="false" />
+
+        <Button
+            android:textColor="@color/black"
+            android:gravity="right|center_vertical|center_horizontal|center"
+            android:layout_gravity="right|center_vertical|center_horizontal|center"
+            android:id="@+id/clear_title_btn"
+            android:background="@drawable/clear_text"
+            android:visibility="gone"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginRight="5dp" />
     </FrameLayout>
-    <EditText android:enabled="false" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="fill_horizontal" android:id="@+id/location" android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollHorizontally="true" android:capitalize="none" android:autoText="false"/>
+
+    <EditText
+        android:enabled="false"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="fill_horizontal"
+        android:id="@+id/location"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollHorizontally="true"
+        android:capitalize="none"
+        android:autoText="false" />
 </LinearLayout>

app/src/main/res/layout/epsonconnect_print_log.xml

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent">
-        <WebView android:id="@+id/prtlog_webview" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <WebView
+            android:id="@+id/prtlog_webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
     </FrameLayout>
 </LinearLayout>

app/src/main/res/layout/epsonconnect_printer_item.xml

@@ -1,12 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center_vertical" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="match_parent">
-    <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content">
-        <TextView android:textSize="20dp" android:textStyle="bold" android:textColor="@android:color/black" android:ellipsize="end" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/name" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:singleLine="true" android:maxLength="62"/>
-        <TextView android:textSize="20dp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/ip" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:singleLine="true" android:maxLength="100"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="center_vertical"
+    android:background="@drawable/select_setting_border"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:textSize="20dp"
+            android:textStyle="bold"
+            android:textColor="@android:color/black"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/name"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:singleLine="true"
+            android:maxLength="62" />
+
+        <TextView
+            android:textSize="20dp"
+            android:textColor="@android:color/darker_gray"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/ip"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:singleLine="true"
+            android:maxLength="100" />
     </LinearLayout>
-    <LinearLayout android:layout_gravity="right|center_vertical|center_horizontal|center" android:layout_width="wrap_content" android:layout_height="wrap_content">
-        <ImageView android:id="@+id/print_remote_icon" android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/print_remote"/>
-        <ImageView android:id="@+id/print_local_icon" android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/print_local"/>
-        <ImageView android:id="@+id/active_icon" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp" android:src="@drawable/selected"/>
+
+    <LinearLayout
+        android:layout_gravity="right|center_vertical|center_horizontal|center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/print_remote_icon"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/print_remote" />
+
+        <ImageView
+            android:id="@+id/print_local_icon"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/print_local" />
+
+        <ImageView
+            android:id="@+id/active_icon"
+            android:visibility="gone"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/selected" />
     </LinearLayout>
 </FrameLayout>

app/src/main/res/layout/epsonconnect_printer_setting_layout.xml

@@ -1,29 +1,210 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-            <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/printer_name_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="5dp" android:minHeight="45dp" android:text="@string/epsonconnect_str_printer_name"/>
-            <FrameLayout android:id="@+id/printer_name_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <EditText android:textSize="18dp" android:id="@+id/printer_name_edit" android:background="@drawable/setting_border" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingRight="35dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="48dp" android:singleLine="true"/>
-                <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_printer_name_btn" android:background="@drawable/clear_text" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:textSize="17sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                android:gravity="center_vertical"
+                android:id="@+id/printer_name_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="5dp"
+                android:minHeight="45dp"
+                android:text="@string/epsonconnect_str_printer_name" />
+
+            <FrameLayout
+                android:id="@+id/printer_name_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <EditText
+                    android:textSize="18dp"
+                    android:id="@+id/printer_name_edit"
+                    android:background="@drawable/setting_border"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="5dp"
+                    android:paddingRight="35dp"
+                    android:paddingBottom="5dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:singleLine="true" />
+
+                <Button
+                    android:textColor="@color/black"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="right|center_vertical|center_horizontal|center"
+                    android:id="@+id/clear_printer_name_btn"
+                    android:background="@drawable/clear_text"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="5dp" />
             </FrameLayout>
-            <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/printer_email_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="20dp" android:minHeight="45dp" android:text="@string/epsonconnect_str_print_email"/>
-            <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <EditText android:textSize="18dp" android:id="@+id/printer_email_address_edit" android:background="@drawable/setting_border" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingRight="35dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="48dp" android:singleLine="true" android:inputType="textEmailAddress"/>
-                <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_printer_email_address_btn" android:background="@drawable/clear_text" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+
+            <TextView
+                android:textSize="17sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                android:gravity="center_vertical"
+                android:id="@+id/printer_email_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="20dp"
+                android:minHeight="45dp"
+                android:text="@string/epsonconnect_str_print_email" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <EditText
+                    android:textSize="18dp"
+                    android:id="@+id/printer_email_address_edit"
+                    android:background="@drawable/setting_border"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="5dp"
+                    android:paddingRight="35dp"
+                    android:paddingBottom="5dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:singleLine="true"
+                    android:inputType="textEmailAddress" />
+
+                <Button
+                    android:textColor="@color/black"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="right|center_vertical|center_horizontal|center"
+                    android:id="@+id/clear_printer_email_address_btn"
+                    android:background="@drawable/clear_text"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="5dp" />
             </FrameLayout>
-            <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/access_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="20dp" android:minHeight="45dp" android:text="@string/epsonconnect_str_print_access_key"/>
-            <FrameLayout android:id="@+id/access_key_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                <EditText android:textSize="16dp" android:ellipsize="end" android:id="@+id/access_key_edit" android:background="@drawable/setting_border" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingRight="35dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="48dp" android:hint="@string/epsonconnect_str_remote_print_access_key_warning" android:singleLine="true" android:inputType="textPassword"/>
-                <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_access_key_btn" android:background="@drawable/clear_text" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+
+            <TextView
+                android:textSize="17sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                android:gravity="center_vertical"
+                android:id="@+id/access_key_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="20dp"
+                android:minHeight="45dp"
+                android:text="@string/epsonconnect_str_print_access_key" />
+
+            <FrameLayout
+                android:id="@+id/access_key_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="5dp">
+
+                <EditText
+                    android:textSize="16dp"
+                    android:ellipsize="end"
+                    android:id="@+id/access_key_edit"
+                    android:background="@drawable/setting_border"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="5dp"
+                    android:paddingRight="35dp"
+                    android:paddingBottom="5dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:hint="@string/epsonconnect_str_remote_print_access_key_warning"
+                    android:singleLine="true"
+                    android:inputType="textPassword" />
+
+                <Button
+                    android:textColor="@color/black"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="right|center_vertical|center_horizontal|center"
+                    android:id="@+id/clear_access_key_btn"
+                    android:background="@drawable/clear_text"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="5dp" />
             </FrameLayout>
-            <View android:background="@color/black" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginLeft="8dp" android:layout_marginTop="30dp" android:layout_marginRight="8dp" android:layout_marginBottom="30dp"/>
-            <LinearLayout android:orientation="vertical" android:id="@+id/get_mailadress" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/tvepsonconnect" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/remoteprinter_notregister" android:layout_alignParentLeft="true"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/rlPrinterSettings" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" android:minHeight="48dp">
-                    <TextView android:gravity="center_vertical" android:layout_gravity="left|center_vertical|center_horizontal|center" android:id="@+id/TextView02" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/remoteprinter_get_emailadress" android:layout_weight="1" style="@style/ItemTextBold"/>
-                    <ImageView android:layout_gravity="center_vertical" android:background="@drawable/next_screen" android:layout_width="38dp" android:layout_height="38dp" android:scaleType="fitXY"/>
+
+            <View
+                android:background="@color/black"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginBottom="30dp" />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/get_mailadress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:textSize="17sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:id="@+id/tvepsonconnect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:text="@string/remoteprinter_notregister"
+                    android:layout_alignParentLeft="true" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/rlPrinterSettings"
+                    android:background="@drawable/select_setting_border"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:minHeight="48dp">
+
+                    <TextView
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left|center_vertical|center_horizontal|center"
+                        android:id="@+id/TextView02"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="@string/remoteprinter_get_emailadress"
+                        android:layout_weight="1"
+                        style="@style/ItemTextBold" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:background="@drawable/next_screen"
+                        android:layout_width="38dp"
+                        android:layout_height="38dp"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>

app/src/main/res/layout/file_browser.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ListView android:id="@+id/filelist" android:layout_width="match_parent" android:layout_height="match_parent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ListView
+        android:id="@+id/filelist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </LinearLayout>

app/src/main/res/layout/file_list_item.xml

@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" android:minHeight="@dimen/list_item_height">
-    <ImageView android:layout_gravity="center_vertical" android:id="@+id/file_folder_icon" android:layout_width="@dimen/list_item_height" android:layout_height="@dimen/list_item_height"/>
-    <TextView android:textColor="@color/text_color" android:layout_gravity="left|center_vertical|center_horizontal|center" android:id="@+id/file_folder_name" android:paddingLeft="@dimen/list_item_text_padding_left" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/browse_folder" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="center"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="@dimen/list_item_height">
+
+    <ImageView
+        android:layout_gravity="center_vertical"
+        android:id="@+id/file_folder_icon"
+        android:layout_width="@dimen/list_item_height"
+        android:layout_height="@dimen/list_item_height" />
+
+    <TextView
+        android:textColor="@color/text_color"
+        android:layout_gravity="left|center_vertical|center_horizontal|center"
+        android:id="@+id/file_folder_name"
+        android:paddingLeft="@dimen/list_item_text_padding_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:layout_gravity="right|center_vertical|center_horizontal|center"
+        android:id="@+id/browse_folder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </FrameLayout>

app/src/main/res/layout/file_select_row.xml

@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="@color/all_white" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <ImageView android:id="@+id/file_item_image" android:layout_width="@dimen/list_item_height" android:layout_height="@dimen/list_item_height"/>
-    <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" android:id="@+id/file_item_text" android:paddingLeft="6dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:background="@color/all_white"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/file_item_image"
+        android:layout_width="@dimen/list_item_height"
+        android:layout_height="@dimen/list_item_height" />
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="center_vertical"
+        android:id="@+id/file_item_text"
+        android:paddingLeft="6dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>

app/src/main/res/layout/folder_content_layout.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/chtc_contacts_groups_layout" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <include layout="@layout/folder_listview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:id="@+id/chtc_contacts_groups_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <include layout="@layout/folder_listview" />
 </LinearLayout>

app/src/main/res/layout/folder_content_layout_for_upload.xml

@@ -1,28 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/folder_content_layout_for_upload" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <FrameLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-        <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="@dimen/title_height">
-            <TextView android:textSize="18dp" android:textStyle="bold" android:textColor="@color/black" android:layout_gravity="center" android:id="@android:id/empty" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sign_in_request"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:id="@+id/folder_content_layout_for_upload"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <FrameLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/title_height">
+
+            <TextView
+                android:textSize="18dp"
+                android:textStyle="bold"
+                android:textColor="@color/black"
+                android:layout_gravity="center"
+                android:id="@android:id/empty"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sign_in_request" />
         </FrameLayout>
-        <include layout="@layout/folder_content_save_option"/>
-        <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/title_height">
-            <LinearLayout android:orientation="vertical" android:id="@+id/upload_file_name_file_type_section" android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="18dp" android:textColor="@color/black" android:id="@+id/upload_dialog_file_name_label" android:padding="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_file_name"/>
-                <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <EditText android:id="@+id/upload_dialog_file_name" android:paddingRight="35dp" android:layout_width="match_parent" android:layout_height="60dp" android:singleLine="true">
-                        <requestFocus/>
+
+        <include layout="@layout/folder_content_save_option" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/title_height">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/upload_file_name_file_type_section"
+                android:padding="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textColor="@color/black"
+                    android:id="@+id/upload_dialog_file_name_label"
+                    android:padding="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/str_file_name" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/upload_dialog_file_name"
+                        android:paddingRight="35dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:singleLine="true">
+
+                        <requestFocus />
                     </EditText>
-                    <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_name_btn" android:background="@drawable/clear_text" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+
+                    <Button
+                        android:textColor="@color/black"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/clear_name_btn"
+                        android:background="@drawable/clear_text"
+                        android:visibility="gone"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginRight="5dp" />
                 </FrameLayout>
-                <TextView android:textSize="18dp" android:textColor="@color/black" android:id="@+id/upload_dialog_file_type_label" android:padding="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_file_type"/>
-                <RadioGroup android:orientation="vertical" android:id="@+id/file_type_for_upload" android:background="@drawable/listitem_bg" android:padding="5dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <RadioButton android:textColor="@color/black" android:id="@+id/pdf_type" android:layout_width="match_parent" android:text="PDF"/>
-                    <View android:background="@drawable/list_divider" android:padding="0dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                    <RadioButton android:textColor="@color/black" android:id="@+id/jpeg_type" android:layout_width="match_parent" android:layout_height="60dp" android:text="JPEG"/>
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textColor="@color/black"
+                    android:id="@+id/upload_dialog_file_type_label"
+                    android:padding="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/str_file_type" />
+
+                <RadioGroup
+                    android:orientation="vertical"
+                    android:id="@+id/file_type_for_upload"
+                    android:background="@drawable/listitem_bg"
+                    android:padding="5dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <RadioButton
+                        android:textColor="@color/black"
+                        android:id="@+id/pdf_type"
+                        android:layout_width="match_parent"
+                        android:text="PDF" />
+
+                    <View
+                        android:background="@drawable/list_divider"
+                        android:padding="0dp"
+                        android:visibility="gone"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp" />
+
+                    <RadioButton
+                        android:textColor="@color/black"
+                        android:id="@+id/jpeg_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:text="JPEG" />
                 </RadioGroup>
-                <TextView android:textSize="18dp" android:textColor="@color/black" android:id="@+id/file_size_label" android:padding="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_total_file_size"/>
-                <TextView android:textSize="18dp" android:gravity="right|center_vertical|center_horizontal|center" android:id="@+id/file_size" android:background="@drawable/listitem_bg" android:padding="10dp" android:layout_width="match_parent" android:layout_height="60dp" android:text="fdsaf"/>
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textColor="@color/black"
+                    android:id="@+id/file_size_label"
+                    android:padding="5dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/str_total_file_size" />
+
+                <TextView
+                    android:textSize="18dp"
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:id="@+id/file_size"
+                    android:background="@drawable/listitem_bg"
+                    android:padding="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:text="fdsaf" />
             </LinearLayout>
         </ScrollView>
     </FrameLayout>

app/src/main/res/layout/folder_content_save_option.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="bottom" android:id="@+id/save_section" style="@style/FunctionBar">
-    <Button android:id="@+id/save_button" android:layout_alignParentRight="true" style="@style/FunctionButton.Execute"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="bottom"
+    android:id="@+id/save_section"
+    style="@style/FunctionBar">
+
+    <Button
+        android:id="@+id/save_button"
+        android:layout_alignParentRight="true"
+        style="@style/FunctionButton.Execute" />
 </RelativeLayout>

app/src/main/res/layout/folder_listview.xml

@@ -1,6 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/listview" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ListView android:scrollbarSize="1dp" android:id="@android:id/list" android:background="@color/all_white" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <TextView android:textColor="@color/text_color" android:gravity="center" android:id="@android:id/empty" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <ProgressBar android:layout_gravity="center" android:id="@android:id/progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/listview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:scrollbarSize="1dp"
+        android:id="@android:id/list"
+        android:background="@color/all_white"
+        android:scrollbars="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:textColor="@color/text_color"
+        android:gravity="center"
+        android:id="@android:id/empty"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@android:id/progress"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </FrameLayout>

app/src/main/res/layout/fragment_camera_preview.xml

@@ -1,9 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/RelativeLayout1" android:layout_width="match_parent" android:layout_height="match_parent" android:keepScreenOn="true">
-    <com.epson.cameracopy.device.OpenCvCameraView android:id="@+id/view1" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:layout_alignParentBottom="true"/>
-    <LinearLayout android:id="@+id/function_bar" style="@style/FunctionBar">
-        <Button android:id="@+id/photo_select_button" android:text="@string/photo_select_button" style="@style/FunctionButton.Normal"/>
-        <TextView android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-        <Button android:id="@+id/photograph_button" android:text="@string/photograph_button" style="@style/FunctionButton.Execute"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/RelativeLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:keepScreenOn="true">
+
+    <com.epson.cameracopy.device.OpenCvCameraView
+        android:id="@+id/view1"
+        android:visibility="invisible"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true" />
+
+    <LinearLayout
+        android:id="@+id/function_bar"
+        style="@style/FunctionBar">
+
+        <Button
+            android:id="@+id/photo_select_button"
+            android:text="@string/photo_select_button"
+            style="@style/FunctionButton.Normal" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/photograph_button"
+            android:text="@string/photograph_button"
+            style="@style/FunctionButton.Execute" />
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/fragment_camera_preview_option.xml

@@ -1,28 +1,163 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ScrollView android:id="@+id/scrollView1" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/activity_horizontal_margin" android:layout_alignParentLeft="true">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textSize="18sp" android:textColor="@android:color/black" android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picture_taking_option"/>
-            <LinearLayout android:orientation="vertical" android:background="@drawable/select_setting_border" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingRight="5dp" android:paddingBottom="0dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" android:divider="@android:drawable/divider_horizontal_dark" android:showDividers="middle" android:dividerPadding="2dp">
-                <LinearLayout android:id="@+id/guide_layout" android:layout_width="match_parent" android:layout_height="@dimen/list_item_height">
-                    <TextView android:textSize="18sp" android:textColor="@android:color/black" android:layout_gravity="center_vertical" android:id="@+id/textView23" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guide_control" android:layout_weight="1"/>
-                    <Switch android:id="@+id/guideToggleButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/activity_horizontal_margin"
+        android:layout_alignParentLeft="true">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textSize="18sp"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/picture_taking_option" />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:background="@drawable/select_setting_border"
+                android:paddingLeft="5dp"
+                android:paddingTop="5dp"
+                android:paddingRight="5dp"
+                android:paddingBottom="0dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:divider="@android:drawable/divider_horizontal_dark"
+                android:showDividers="middle"
+                android:dividerPadding="2dp">
+
+                <LinearLayout
+                    android:id="@+id/guide_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/list_item_height">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textColor="@android:color/black"
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/textView23"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/guide_control"
+                        android:layout_weight="1" />
+
+                    <Switch
+                        android:id="@+id/guideToggleButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0" />
                 </LinearLayout>
-                <ImageView android:id="@+id/imageView1" android:layout_width="match_parent" android:layout_height="0dp" android:src="@android:drawable/divider_horizontal_textfield" android:scaleType="fitXY" android:layout_weight="1"/>
-                <LinearLayout android:id="@+id/auto_pict_taken_layout" android:layout_width="match_parent" android:layout_height="@dimen/list_item_height">
-                    <TextView android:textSize="18sp" android:textColor="@android:color/black" android:layout_gravity="center_vertical" android:id="@+id/printtarget_size_text" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/auto_picture_taking_str" android:layout_weight="1"/>
-                    <Switch android:layout_gravity="center_vertical" android:id="@+id/autoPictureToggleButton" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
+                <ImageView
+                    android:id="@+id/imageView1"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:src="@android:drawable/divider_horizontal_textfield"
+                    android:scaleType="fitXY"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    android:id="@+id/auto_pict_taken_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/list_item_height">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textColor="@android:color/black"
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/printtarget_size_text"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/auto_picture_taking_str"
+                        android:layout_weight="1" />
+
+                    <Switch
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/autoPictureToggleButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
             </LinearLayout>
-            <TextView android:textSize="18sp" android:textColor="@android:color/black" android:id="@+id/scale_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/save_directory"/>
-            <LinearLayout android:id="@+id/save_directory_layout" android:background="@drawable/select_setting_border" android:padding="5dp" android:clickable="true" android:layout_width="match_parent" android:layout_height="@dimen/list_item_height" android:layout_margin="4dp">
-                <TextView android:textSize="18sp" android:textColor="@color/gray" android:layout_gravity="center_vertical" android:id="@+id/saveDirectoryText" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@android:string/unknownName" android:layout_weight="1"/>
-                <ImageView android:id="@+id/imageView2" android:layout_width="27dp" android:layout_height="27dp" android:src="@drawable/next_screen"/>
+
+            <TextView
+                android:textSize="18sp"
+                android:textColor="@android:color/black"
+                android:id="@+id/scale_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/save_directory" />
+
+            <LinearLayout
+                android:id="@+id/save_directory_layout"
+                android:background="@drawable/select_setting_border"
+                android:padding="5dp"
+                android:clickable="true"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/list_item_height"
+                android:layout_margin="4dp">
+
+                <TextView
+                    android:textSize="18sp"
+                    android:textColor="@color/gray"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/saveDirectoryText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@android:string/unknownName"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="27dp"
+                    android:layout_height="27dp"
+                    android:src="@drawable/next_screen" />
             </LinearLayout>
-            <TextView android:textSize="18sp" android:textColor="@android:color/black" android:id="@+id/pixtureResText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/picture_size"/>
-            <LinearLayout android:id="@+id/picture_resolution_layout" android:background="@drawable/select_setting_border" android:padding="5dp" android:clickable="true" android:layout_width="match_parent" android:layout_height="@dimen/list_item_height" android:layout_margin="4dp">
-                <TextView android:textSize="18sp" android:textColor="@color/gray" android:layout_gravity="center_vertical" android:id="@+id/pictureResolutionText" android:layout_width="0dp" android:layout_height="wrap_content" android:text="0x0" android:layout_weight="1"/>
-                <ImageView android:id="@+id/pictureResolutionImageView" android:layout_width="27dp" android:layout_height="27dp" android:src="@drawable/next_screen"/>
+
+            <TextView
+                android:textSize="18sp"
+                android:textColor="@android:color/black"
+                android:id="@+id/pixtureResText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/picture_size" />
+
+            <LinearLayout
+                android:id="@+id/picture_resolution_layout"
+                android:background="@drawable/select_setting_border"
+                android:padding="5dp"
+                android:clickable="true"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/list_item_height"
+                android:layout_margin="4dp">
+
+                <TextView
+                    android:textSize="18sp"
+                    android:textColor="@color/gray"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/pictureResolutionText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="0x0"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/pictureResolutionImageView"
+                    android:layout_width="27dp"
+                    android:layout_height="27dp"
+                    android:src="@drawable/next_screen" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/fragment_guide_webview.xml

@@ -1,9 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <FrameLayout android:layout_gravity="center" android:id="@+id/guideWebViewFrame" android:layout_width="330dp" android:layout_height="330dp">
-        <FrameLayout android:layout_gravity="center" android:background="@drawable/rectangle" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="6dp" android:layout_marginTop="6dp" android:layout_marginRight="6dp" android:layout_marginBottom="6dp">
-            <WebView android:layout_gravity="center" android:id="@+id/guideWebview" android:layout_width="300dp" android:layout_height="300dp"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_gravity="center"
+        android:id="@+id/guideWebViewFrame"
+        android:layout_width="330dp"
+        android:layout_height="330dp">
+
+        <FrameLayout
+            android:layout_gravity="center"
+            android:background="@drawable/rectangle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="6dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginBottom="6dp">
+
+            <WebView
+                android:layout_gravity="center"
+                android:id="@+id/guideWebview"
+                android:layout_width="300dp"
+                android:layout_height="300dp" />
         </FrameLayout>
-        <ImageView android:layout_gravity="end" android:id="@+id/closeImage" android:layout_width="wrap_content" android:layout_height="wrap_content" app:srcCompat="@drawable/close_screen"/>
+
+        <ImageView
+            android:layout_gravity="end"
+            android:id="@+id/closeImage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/close_screen" />
     </FrameLayout>
 </FrameLayout>

app/src/main/res/layout/fragment_image_grid.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/epson_lib_clean" android:layout_width="match_parent" android:layout_height="match_parent">
-    <GridView android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/gridView" android:layout_width="match_parent" android:layout_height="match_parent" android:horizontalSpacing="@dimen/image_selector_grid_thumbnail_spacing" android:verticalSpacing="@dimen/image_selector_grid_thumbnail_spacing" android:stretchMode="columnWidth" android:columnWidth="@dimen/image_selector_grid_thumbnail_size" android:numColumns="auto_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/epson_lib_clean"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <GridView
+        android:gravity="center"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/gridView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:horizontalSpacing="@dimen/image_selector_grid_thumbnail_spacing"
+        android:verticalSpacing="@dimen/image_selector_grid_thumbnail_spacing"
+        android:stretchMode="columnWidth"
+        android:columnWidth="@dimen/image_selector_grid_thumbnail_size"
+        android:numColumns="auto_fit" />
 </LinearLayout>

app/src/main/res/layout/fragment_image_preview_view.xml

@@ -1,11 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <epson.common.ScalableImageView android:id="@+id/preview_view" android:background="@color/background_preview" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/function_bar" android:layout_alignParentLeft="true"/>
-    <ProgressBar android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_centerVertical="true"/>
-    <LinearLayout android:id="@+id/function_bar" android:layout_centerInParent="true" style="@style/FunctionBar">
-        <Button android:id="@+id/save_button" android:text="@string/save_button" style="@style/FunctionButton.Normal"/>
-        <TextView android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-        <Button android:id="@+id/print_button" android:text="@string/print_preview_button" style="@style/FunctionButton.Normal"/>
-        <Button android:id="@+id/retouch_button" android:text="@string/retouch_button" style="@style/FunctionButton.Execute"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <epson.common.ScalableImageView
+        android:id="@+id/preview_view"
+        android:background="@color/background_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/function_bar"
+        android:layout_alignParentLeft="true" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true" />
+
+    <LinearLayout
+        android:id="@+id/function_bar"
+        android:layout_centerInParent="true"
+        style="@style/FunctionBar">
+
+        <Button
+            android:id="@+id/save_button"
+            android:text="@string/save_button"
+            style="@style/FunctionButton.Normal" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/print_button"
+            android:text="@string/print_preview_button"
+            style="@style/FunctionButton.Normal" />
+
+        <Button
+            android:id="@+id/retouch_button"
+            android:text="@string/retouch_button"
+            style="@style/FunctionButton.Execute" />
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/fragment_image_view.xml

@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/epson_lib_clean" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ProgressBar android:layout_gravity="center" android:id="@+id/progressBar3" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-        <ImageView android:layout_gravity="center" android:id="@+id/imageView" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:layout_weight="1"/>
-        <ToggleButton android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:id="@+id/toggleButton2" android:background="@drawable/imgsel_pager_sel_button_multi_back" android:paddingLeft="20dp" android:paddingTop="5dp" android:paddingRight="20dp" android:paddingBottom="5dp" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:checked="false" android:textOn="@string/imgsel_view_pager_toggle_on" android:textOff="@string/imgsel_view_pager_toggle_off" android:minWidth="180dp" android:drawableLeft="@drawable/imgsel_checkbox" android:drawablePadding="0dp"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/epson_lib_clean"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/progressBar3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_gravity="center"
+            android:id="@+id/imageView"
+            android:visibility="invisible"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1" />
+
+        <ToggleButton
+            android:layout_gravity="bottom|center_vertical|center_horizontal|center"
+            android:id="@+id/toggleButton2"
+            android:background="@drawable/imgsel_pager_sel_button_multi_back"
+            android:paddingLeft="20dp"
+            android:paddingTop="5dp"
+            android:paddingRight="20dp"
+            android:paddingBottom="5dp"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:checked="false"
+            android:textOn="@string/imgsel_view_pager_toggle_on"
+            android:textOff="@string/imgsel_view_pager_toggle_off"
+            android:minWidth="180dp"
+            android:drawableLeft="@drawable/imgsel_checkbox"
+            android:drawablePadding="0dp" />
     </LinearLayout>
 </FrameLayout>

app/src/main/res/layout/fragment_image_view_multi.xml

@@ -1,9 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/epson_lib_clean" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ProgressBar android:id="@+id/imageLoadProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true"/>
-    <epson.common.ScalableImageView android:layout_gravity="center" android:id="@+id/imageView" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:layout_above="@+id/myToggle" android:layout_alignParentTop="true"/>
-    <LinearLayout android:gravity="center" android:layout_gravity="center_horizontal" android:orientation="horizontal" android:id="@+id/myToggle" android:background="@drawable/imgsel_pager_sel_button_multi_back" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:minWidth="200sp" android:minHeight="48dp" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true">
-        <ImageView android:id="@+id/myToggleImage" android:clickable="false" android:layout_width="22dp" android:layout_height="22dp" android:layout_marginLeft="10sp" android:src="@drawable/imgsel_multi_checkbox" android:scaleType="centerCrop"/>
-        <TextView android:textColor="@android:color/primary_text_light" android:id="@+id/myToggleText" android:background="@color/epson_lib_clean" android:paddingLeft="10sp" android:paddingRight="15sp" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/imgsel_view_pager_toggle_off" style="@style/TextAppearance.DeviceDefault.Widget.Button"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/epson_lib_clean"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/imageLoadProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
+
+    <epson.common.ScalableImageView
+        android:layout_gravity="center"
+        android:id="@+id/imageView"
+        android:visibility="invisible"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_above="@+id/myToggle"
+        android:layout_alignParentTop="true" />
+
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:id="@+id/myToggle"
+        android:background="@drawable/imgsel_pager_sel_button_multi_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:minWidth="200sp"
+        android:minHeight="48dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true">
+
+        <ImageView
+            android:id="@+id/myToggleImage"
+            android:clickable="false"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:layout_marginLeft="10sp"
+            android:src="@drawable/imgsel_multi_checkbox"
+            android:scaleType="centerCrop" />
+
+        <TextView
+            android:textColor="@android:color/primary_text_light"
+            android:id="@+id/myToggleText"
+            android:background="@color/epson_lib_clean"
+            android:paddingLeft="10sp"
+            android:paddingRight="15sp"
+            android:clickable="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/imgsel_view_pager_toggle_off"
+            style="@style/TextAppearance.DeviceDefault.Widget.Button" />
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/fragment_image_view_single.xml

@@ -1,8 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/epson_lib_clean" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ProgressBar android:layout_gravity="center" android:id="@+id/imageLoadProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-        <epson.common.ScalableImageView android:layout_gravity="center" android:id="@+id/imageView" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:layout_weight="1"/>
-        <Button android:textColor="@color/all_white" android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:id="@+id/selectButton" android:background="@color/epson_blue" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:maxWidth="180dp" android:text="@string/imgsel_view_pager_toggle_off"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/epson_lib_clean"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/imageLoadProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <epson.common.ScalableImageView
+            android:layout_gravity="center"
+            android:id="@+id/imageView"
+            android:visibility="invisible"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1" />
+
+        <Button
+            android:textColor="@color/all_white"
+            android:layout_gravity="bottom|center_vertical|center_horizontal|center"
+            android:id="@+id/selectButton"
+            android:background="@color/epson_blue"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:maxWidth="180dp"
+            android:text="@string/imgsel_view_pager_toggle_off" />
     </LinearLayout>
 </FrameLayout>

app/src/main/res/layout/fragment_item_grid.xml

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <GridView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" android:numColumns="2"/>
-    <TextView android:gravity="center" android:id="@android:id/empty" android:layout_width="match_parent" android:layout_height="match_parent"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <GridView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:numColumns="2" />
+
+    <TextView
+        android:gravity="center"
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </FrameLayout>

app/src/main/res/layout/fragment_item_list.xml

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <TextView android:gravity="center" android:id="@android:id/empty" android:layout_width="match_parent" android:layout_height="match_parent"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:gravity="center"
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </FrameLayout>

app/src/main/res/layout/fragment_password_dialog.xml

@@ -1,14 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/RelativeLayout1" android:background="@color/epson_lib_clear" android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <RelativeLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:id="@+id/password_message" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginBottom="20dp" android:text="@string/memcard_password_input_message" android:layout_alignParentLeft="true" android:layout_alignParentTop="true"/>
-        <EditText android:id="@+id/memcardUsername" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:ems="10" android:maxLength="128" android:layout_toRightOf="@+id/textView1" android:layout_below="@+id/password_message" android:inputType="text">
-            <requestFocus/>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/RelativeLayout1"
+    android:background="@color/epson_lib_clear"
+    android:padding="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/password_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="20dp"
+            android:text="@string/memcard_password_input_message"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true" />
+
+        <EditText
+            android:id="@+id/memcardUsername"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:ems="10"
+            android:maxLength="128"
+            android:layout_toRightOf="@+id/textView1"
+            android:layout_below="@+id/password_message"
+            android:inputType="text">
+
+            <requestFocus />
         </EditText>
-        <EditText android:id="@+id/memcardPassword" android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" android:maxLength="64" android:layout_below="@+id/memcardUsername" android:layout_alignLeft="@+id/memcardUsername" android:layout_alignParentLeft="false" android:inputType="textPassword"/>
-        <TextView android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_user_name" android:layout_alignBaseline="@+id/memcardUsername" android:layout_alignBottom="@+id/memcardUsername" android:layout_alignParentLeft="true"/>
-        <TextView android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_enter_pass" android:layout_below="@+id/textView1" android:layout_alignBaseline="@+id/memcardPassword" android:layout_alignParentLeft="true"/>
-        <ImageButton android:id="@+id/imageButton1" android:visibility="gone" android:layout_width="25dp" android:layout_height="25dp" android:layout_marginTop="10dp" android:layout_marginRight="5dp" android:src="@android:drawable/ic_menu_close_clear_cancel" android:layout_alignRight="@+id/memcardUsername" android:layout_alignParentTop="false" android:layout_alignParentRight="false" android:layout_centerVertical="false"/>
-        <ImageButton android:id="@+id/imageButton2" android:visibility="gone" android:layout_width="25dp" android:layout_height="25dp" android:layout_marginTop="10dp" android:layout_marginRight="5dp" android:src="@android:drawable/ic_menu_close_clear_cancel" android:layout_alignTop="@+id/memcardPassword" android:layout_alignParentRight="true"/>
+
+        <EditText
+            android:id="@+id/memcardPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:maxLength="64"
+            android:layout_below="@+id/memcardUsername"
+            android:layout_alignLeft="@+id/memcardUsername"
+            android:layout_alignParentLeft="false"
+            android:inputType="textPassword" />
+
+        <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/str_user_name"
+            android:layout_alignBaseline="@+id/memcardUsername"
+            android:layout_alignBottom="@+id/memcardUsername"
+            android:layout_alignParentLeft="true" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/str_enter_pass"
+            android:layout_below="@+id/textView1"
+            android:layout_alignBaseline="@+id/memcardPassword"
+            android:layout_alignParentLeft="true" />
+
+        <ImageButton
+            android:id="@+id/imageButton1"
+            android:visibility="gone"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="5dp"
+            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            android:layout_alignRight="@+id/memcardUsername"
+            android:layout_alignParentTop="false"
+            android:layout_alignParentRight="false"
+            android:layout_centerVertical="false" />
+
+        <ImageButton
+            android:id="@+id/imageButton2"
+            android:visibility="gone"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="5dp"
+            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            android:layout_alignTop="@+id/memcardPassword"
+            android:layout_alignParentRight="true" />
     </RelativeLayout>
 </ScrollView>

app/src/main/res/layout/fwupdate_progress.xml

@@ -1,8 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/all_white" android:id="@+id/messageTitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp"/>
-    <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/all_white" android:id="@+id/messageText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp"/>
-    <ProgressBar android:layout_gravity="center" android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" style="?android:attr/progressBarStyle"/>
-    <ProgressBar android:layout_gravity="center" android:id="@+id/horizontalProgressBar" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="30dp" android:layout_marginTop="15dp" android:layout_marginRight="30dp" android:layout_marginBottom="15dp" style="?android:attr/progressBarStyleHorizontal"/>
-    <Button android:gravity="center" android:id="@+id/cancelButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/all_white"
+        android:id="@+id/messageTitle"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp" />
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/all_white"
+        android:id="@+id/messageText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        style="?android:attr/progressBarStyle" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/horizontalProgressBar"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="30dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="15dp"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <Button
+        android:gravity="center"
+        android:id="@+id/cancelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp" />
 </LinearLayout>

app/src/main/res/layout/grid_item_imgsel.xml

@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ImageView android:id="@+id/imageThumbnail" android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="centerCrop" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentStart="true"/>
-    <ImageView android:id="@+id/checkIcon" android:visibility="invisible" android:layout_width="@dimen/imgsel_grid_sel_icon_size" android:layout_height="@dimen/imgsel_grid_sel_icon_size" android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:src="@drawable/check_selected" android:layout_alignLeft="@+id/imageThumbnail" android:layout_alignTop="@+id/imageThumbnail" android:layout_alignParentBottom="false"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/imageThumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true" />
+
+    <ImageView
+        android:id="@+id/checkIcon"
+        android:visibility="invisible"
+        android:layout_width="@dimen/imgsel_grid_sel_icon_size"
+        android:layout_height="@dimen/imgsel_grid_sel_icon_size"
+        android:layout_marginLeft="4dp"
+        android:layout_marginTop="4dp"
+        android:src="@drawable/check_selected"
+        android:layout_alignLeft="@+id/imageThumbnail"
+        android:layout_alignTop="@+id/imageThumbnail"
+        android:layout_alignParentBottom="false" />
 </RelativeLayout>

app/src/main/res/layout/help_about.xml

@@ -1,14 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="@drawable/about_boder" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="15dp" android:layout_marginTop="15dp" android:layout_marginRight="15dp" android:layout_marginBottom="15dp">
-        <LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-            <TextView android:textSize="22sp" android:textStyle="bold" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/about_for" android:singleLine="true"/>
-            <TextView android:textSize="18sp" android:id="@+id/version" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="@string/about_ver" android:singleLine="true"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <LinearLayout
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:background="@drawable/about_boder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginBottom="15dp">
+
+        <LinearLayout
+            android:gravity="center"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <TextView
+                android:textSize="22sp"
+                android:textStyle="bold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/about_for"
+                android:singleLine="true" />
+
+            <TextView
+                android:textSize="18sp"
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/about_ver"
+                android:singleLine="true" />
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:orientation="vertical" android:paddingBottom="10dp" android:layout_width="match_parent" android:layout_height="52dp">
-            <TextView android:textSize="10sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/about_copy" android:singleLine="true"/>
-            <TextView android:textSize="9sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" android:text="@string/about_all" android:singleLine="true"/>
+
+        <LinearLayout
+            android:gravity="center"
+            android:orientation="vertical"
+            android:paddingBottom="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="52dp">
+
+            <TextView
+                android:textSize="10sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/about_copy"
+                android:singleLine="true" />
+
+            <TextView
+                android:textSize="9sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:text="@string/about_all"
+                android:singleLine="true" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/home_top.xml

@@ -1,16 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/home_screen_top" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <RelativeLayout android:id="@+id/home_select_printer" android:background="@color/epson_blue" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="74dp">
-        <RelativeLayout android:id="@+id/home_select_printer_detail" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingBottom="7dp" android:duplicateParentState="true" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <ImageView android:id="@+id/home_printer" android:duplicateParentState="true" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/home_printer" android:layout_alignParentLeft="true" android:layout_centerVertical="true"/>
-            <LinearLayout android:orientation="vertical" android:duplicateParentState="true" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@+id/home_printer_next" android:layout_toRightOf="@+id/home_printer" android:layout_centerVertical="true">
-                <TextView android:textSize="24dp" android:textStyle="bold" android:textColor="@color/all_white" android:id="@+id/home_printer_name" android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_lbl_title_scan"/>
-                <LinearLayout android:orientation="horizontal" android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                    <ImageView android:id="@+id/printer_icon" android:duplicateParentState="true" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginRight="5dp"/>
-                    <TextView android:textSize="15dp" android:textColor="@color/all_white" android:id="@+id/home_printer_status" android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/home_screen_top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:id="@+id/home_select_printer"
+        android:background="@color/epson_blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="74dp">
+
+        <RelativeLayout
+            android:id="@+id/home_select_printer_detail"
+            android:paddingLeft="5dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="7dp"
+            android:duplicateParentState="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/home_printer"
+                android:duplicateParentState="true"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:src="@drawable/home_printer"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true" />
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:duplicateParentState="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/home_printer_next"
+                android:layout_toRightOf="@+id/home_printer"
+                android:layout_centerVertical="true">
+
+                <TextView
+                    android:textSize="24dp"
+                    android:textStyle="bold"
+                    android:textColor="@color/all_white"
+                    android:id="@+id/home_printer_name"
+                    android:duplicateParentState="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/str_lbl_title_scan" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:duplicateParentState="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <ImageView
+                        android:id="@+id/printer_icon"
+                        android:duplicateParentState="true"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginRight="5dp" />
+
+                    <TextView
+                        android:textSize="15dp"
+                        android:textColor="@color/all_white"
+                        android:id="@+id/home_printer_status"
+                        android:duplicateParentState="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
             </LinearLayout>
-            <ImageView android:id="@+id/home_printer_next" android:duplicateParentState="true" android:layout_width="27dp" android:layout_height="wrap_content" android:src="@drawable/next_screen_white" android:layout_alignParentRight="true" android:layout_centerVertical="true"/>
+
+            <ImageView
+                android:id="@+id/home_printer_next"
+                android:duplicateParentState="true"
+                android:layout_width="27dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/next_screen_white"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/i2_scan_setting_item.xml

@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/select_setting_border" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <ImageView android:id="@+id/leftImageView" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:src="@drawable/scan_counter_direction" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentStart="true"/>
-    <TextView android:gravity="center_vertical" android:id="@+id/tvSettingName" android:padding="3dp" android:clickable="false" android:layout_marginLeft="5dp" android:layout_toRightOf="@+id/leftImageView" android:layout_alignWithParentIfMissing="true" style="@style/ItemTextBold"/>
-    <ImageView android:id="@+id/ivSettingSelected" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp" android:src="@drawable/selected" android:scaleType="fitXY" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_alignParentEnd="false"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/select_setting_border"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/leftImageView"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:src="@drawable/scan_counter_direction"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:gravity="center_vertical"
+        android:id="@+id/tvSettingName"
+        android:padding="3dp"
+        android:clickable="false"
+        android:layout_marginLeft="5dp"
+        android:layout_toRightOf="@+id/leftImageView"
+        android:layout_alignWithParentIfMissing="true"
+        style="@style/ItemTextBold" />
+
+    <ImageView
+        android:id="@+id/ivSettingSelected"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginRight="5dp"
+        android:src="@drawable/selected"
+        android:scaleType="fitXY"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="false" />
 </RelativeLayout>

app/src/main/res/layout/image_collect_adjustment_bar.xml

@@ -1,7 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/epson_lib_lightyellow" android:paddingLeft="0dp" android:paddingTop="0dp" android:paddingRight="0dp" android:paddingBottom="0dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="1dp" android:layout_marginTop="5dp" android:layout_marginRight="1dp" android:layout_marginBottom="5dp">
-    <RelativeLayout android:orientation="horizontal" android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:textSize="16dp" android:textColor="@color/all_black" android:id="@+id/AdjustmentBarTitle" android:layout_width="100dp" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="Item:" android:layout_alignParentLeft="true" android:layout_centerVertical="true"/>
-        <SeekBar android:layout_gravity="right" android:id="@+id/AdjustmentBarSeekBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="35dp" android:layout_toRightOf="@+id/AdjustmentBarTitle" android:layout_alignParentRight="true"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/epson_lib_lightyellow"
+    android:paddingLeft="0dp"
+    android:paddingTop="0dp"
+    android:paddingRight="0dp"
+    android:paddingBottom="0dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="1dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginRight="1dp"
+    android:layout_marginBottom="5dp">
+
+    <RelativeLayout
+        android:orientation="horizontal"
+        android:background="@color/all_white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:textSize="16dp"
+            android:textColor="@color/all_black"
+            android:id="@+id/AdjustmentBarTitle"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="Item:"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true" />
+
+        <SeekBar
+            android:layout_gravity="right"
+            android:id="@+id/AdjustmentBarSeekBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="35dp"
+            android:layout_toRightOf="@+id/AdjustmentBarTitle"
+            android:layout_alignParentRight="true" />
     </RelativeLayout>
 </LinearLayout>

app/src/main/res/layout/image_collect_layout.xml

@@ -1,16 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="bottom" android:id="@+id/ImageCollectLayout" android:background="@color/all_transparent" android:layout_width="match_parent" android:layout_height="match_parent">
-    <LinearLayout android:orientation="vertical" android:id="@+id/ImageCollectPreviewLayout" android:background="@color/all_transparent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@+id/ImageCollectSwitchLayout" android:layout_alignParentLeft="true" android:layout_alignParentTop="true">
-        <include android:id="@+id/ImageCollectPreview" android:visibility="visible" layout="@layout/image_collect_preview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="bottom"
+    android:id="@+id/ImageCollectLayout"
+    android:background="@color/all_transparent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:id="@+id/ImageCollectPreviewLayout"
+        android:background="@color/all_transparent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/ImageCollectSwitchLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true">
+
+        <include
+            android:id="@+id/ImageCollectPreview"
+            android:visibility="visible"
+            layout="@layout/image_collect_preview" />
     </LinearLayout>
-    <LinearLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/ImageCollectSwitchLayout" android:background="@color/all_transparent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@+id/ImageCollectPalletLayout" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true">
-        <RadioGroup android:orientation="horizontal" android:id="@+id/ImageCollectSwitch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:checkedButton="@+id/leftBtn">
-            <RadioButton android:textColor="@drawable/radio_text_color" android:id="@+id/ImageCollectSwitchLeft" android:background="@drawable/radio_left" android:layout_width="wrap_content" android:text="@string/enhance_text_button" android:singleLine="true" style="@style/CommonRadioButton"/>
-            <RadioButton android:textColor="@drawable/radio_text_color" android:id="@+id/ImageCollectSwitchMiddle" android:background="@drawable/radio_mid" android:layout_width="wrap_content" android:text="@string/enhance_text_more_button" android:singleLine="true" style="@style/CommonRadioButton"/>
-            <RadioButton android:textColor="@drawable/radio_text_color" android:id="@+id/ImageCollectSwitchRight" android:background="@drawable/radio_right" android:layout_width="wrap_content" android:text="@string/original_text_button" android:singleLine="true" style="@style/CommonRadioButton"/>
+
+    <LinearLayout
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:id="@+id/ImageCollectSwitchLayout"
+        android:background="@color/all_transparent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/ImageCollectPalletLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true">
+
+        <RadioGroup
+            android:orientation="horizontal"
+            android:id="@+id/ImageCollectSwitch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:checkedButton="@+id/leftBtn">
+
+            <RadioButton
+                android:textColor="@drawable/radio_text_color"
+                android:id="@+id/ImageCollectSwitchLeft"
+                android:background="@drawable/radio_left"
+                android:layout_width="wrap_content"
+                android:text="@string/enhance_text_button"
+                android:singleLine="true"
+                style="@style/CommonRadioButton" />
+
+            <RadioButton
+                android:textColor="@drawable/radio_text_color"
+                android:id="@+id/ImageCollectSwitchMiddle"
+                android:background="@drawable/radio_mid"
+                android:layout_width="wrap_content"
+                android:text="@string/enhance_text_more_button"
+                android:singleLine="true"
+                style="@style/CommonRadioButton" />
+
+            <RadioButton
+                android:textColor="@drawable/radio_text_color"
+                android:id="@+id/ImageCollectSwitchRight"
+                android:background="@drawable/radio_right"
+                android:layout_width="wrap_content"
+                android:text="@string/original_text_button"
+                android:singleLine="true"
+                style="@style/CommonRadioButton" />
         </RadioGroup>
     </LinearLayout>
-    <LinearLayout android:layout_gravity="bottom" android:orientation="vertical" android:id="@+id/ImageCollectPalletLayout" android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true">
-        <include android:id="@+id/ImageCollectPallet" android:visibility="visible" layout="@layout/image_collect_pallet"/>
+
+    <LinearLayout
+        android:layout_gravity="bottom"
+        android:orientation="vertical"
+        android:id="@+id/ImageCollectPalletLayout"
+        android:background="@color/all_white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true">
+
+        <include
+            android:id="@+id/ImageCollectPallet"
+            android:visibility="visible"
+            layout="@layout/image_collect_pallet" />
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/image_collect_pallet.xml

@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/all_white" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" android:layout_marginBottom="5dp">
-    <include android:id="@+id/ImageCollectAdjustmentBrightness" android:visibility="visible" layout="@layout/image_collect_adjustment_bar"/>
-    <include android:id="@+id/ImageCollectAdjustmentContrast" android:visibility="visible" layout="@layout/image_collect_adjustment_bar"/>
-    <include android:id="@+id/ImageCollectAdjustmentSaturation" android:visibility="visible" layout="@layout/image_collect_adjustment_bar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/all_white"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp">
+
+    <include
+        android:id="@+id/ImageCollectAdjustmentBrightness"
+        android:visibility="visible"
+        layout="@layout/image_collect_adjustment_bar" />
+
+    <include
+        android:id="@+id/ImageCollectAdjustmentContrast"
+        android:visibility="visible"
+        layout="@layout/image_collect_adjustment_bar" />
+
+    <include
+        android:id="@+id/ImageCollectAdjustmentSaturation"
+        android:visibility="visible"
+        layout="@layout/image_collect_adjustment_bar" />
 </LinearLayout>

app/src/main/res/layout/image_collect_preview.xml

@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/all_transparent" android:paddingLeft="0dp" android:paddingTop="0dp" android:paddingRight="0dp" android:paddingBottom="0dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.epson.cameracopy.p006ui.ImageCollectView android:layout_gravity="center" android:id="@+id/ImageCollectView" android:background="@color/all_transparent" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <TextView android:textSize="12dp" android:textColor="@color/all_black" android:layout_gravity="bottom|left|center_vertical|center_horizontal|center" android:id="@+id/ImageCollectPaperSizeInfo" android:background="@color/all_transparent" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="A4"/>
-    <Button android:textSize="26sp" android:textColor="@color/epson_blue" android:layout_gravity="bottom|left|center_vertical|center_horizontal|center" android:id="@+id/ImageCollectPalletButton" android:background="@color/all_white" android:layout_width="36dp" android:layout_height="36dp"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/all_transparent"
+    android:paddingLeft="0dp"
+    android:paddingTop="0dp"
+    android:paddingRight="0dp"
+    android:paddingBottom="0dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.epson.cameracopy.p006ui.ImageCollectView
+        android:layout_gravity="center"
+        android:id="@+id/ImageCollectView"
+        android:background="@color/all_transparent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:textSize="12dp"
+        android:textColor="@color/all_black"
+        android:layout_gravity="bottom|left|center_vertical|center_horizontal|center"
+        android:id="@+id/ImageCollectPaperSizeInfo"
+        android:background="@color/all_transparent"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="A4" />
+
+    <Button
+        android:textSize="26sp"
+        android:textColor="@color/epson_blue"
+        android:layout_gravity="bottom|left|center_vertical|center_horizontal|center"
+        android:id="@+id/ImageCollectPalletButton"
+        android:background="@color/all_white"
+        android:layout_width="36dp"
+        android:layout_height="36dp" />
 </FrameLayout>

app/src/main/res/layout/image_collect_toolbar_color_adjustment.xml

@@ -1,10 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/ImageCollectToolbarColorAdjustment" style="@style/FunctionBar">
-    <RadioGroup android:gravity="center" android:orientation="horizontal" android:id="@+id/AdjustmentModeSwitch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:checkedButton="@+id/leftBtn">
-        <RadioButton android:gravity="center" android:id="@+id/AdjustmentModeSwitchLeft" android:background="@drawable/radio_image_left" android:layout_width="wrap_content" android:layout_height="wrap_content" android:button="@null" android:scaleType="centerInside"/>
-        <RadioButton android:gravity="center" android:id="@+id/AdjustmentModeSwitchRight" android:background="@drawable/radio_image_right" android:layout_width="wrap_content" android:layout_height="wrap_content" android:button="@null" android:scaleType="centerInside"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ImageCollectToolbarColorAdjustment"
+    style="@style/FunctionBar">
+
+    <RadioGroup
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:id="@+id/AdjustmentModeSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:checkedButton="@+id/leftBtn">
+
+        <RadioButton
+            android:gravity="center"
+            android:id="@+id/AdjustmentModeSwitchLeft"
+            android:background="@drawable/radio_image_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:button="@null"
+            android:scaleType="centerInside" />
+
+        <RadioButton
+            android:gravity="center"
+            android:id="@+id/AdjustmentModeSwitchRight"
+            android:background="@drawable/radio_image_right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:button="@null"
+            android:scaleType="centerInside" />
     </RadioGroup>
-    <TextView android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-    <Button android:id="@+id/reset_button" android:text="@string/reset_button" style="@style/FunctionButton.Normal"/>
-    <Button android:id="@+id/execute_button" android:text="@string/execute_button" style="@style/FunctionButton.Execute"/>
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/reset_button"
+        android:text="@string/reset_button"
+        style="@style/FunctionButton.Normal" />
+
+    <Button
+        android:id="@+id/execute_button"
+        android:text="@string/execute_button"
+        style="@style/FunctionButton.Execute" />
 </LinearLayout>

app/src/main/res/layout/image_collect_toolbar_crop_image.xml

@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/ImageCollectToolbarCropImage" android:layout_width="match_parent" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true" style="@style/FunctionBar">
-    <Button android:id="@+id/document_size_button" android:text="@string/document_size_button" style="@style/FunctionButton.Normal"/>
-    <TextView android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-    <Button android:id="@+id/execute_button" android:layout_width="wrap_content" android:text="@string/execute_button" style="@style/FunctionButton.Execute"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ImageCollectToolbarCropImage"
+    android:layout_width="match_parent"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentBottom="true"
+    style="@style/FunctionBar">
+
+    <Button
+        android:id="@+id/document_size_button"
+        android:text="@string/document_size_button"
+        style="@style/FunctionButton.Normal" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/execute_button"
+        android:layout_width="wrap_content"
+        android:text="@string/execute_button"
+        style="@style/FunctionButton.Execute" />
 </LinearLayout>

app/src/main/res/layout/image_collect_toolbar_enhance_text.xml

@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/ImageCollectToolbarEnhanceText" style="@style/FunctionBar">
-    <Button android:id="@+id/save_button" android:text="@string/save_button" style="@style/FunctionButton.Normal"/>
-    <Button android:id="@+id/color_adjustment_button" android:text="@string/color_adjustment_button" style="@style/FunctionButton.Normal"/>
-    <TextView android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-    <Button android:id="@+id/execute_button" android:text="@string/execute_button" style="@style/FunctionButton.Execute"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ImageCollectToolbarEnhanceText"
+    style="@style/FunctionBar">
+
+    <Button
+        android:id="@+id/save_button"
+        android:text="@string/save_button"
+        style="@style/FunctionButton.Normal" />
+
+    <Button
+        android:id="@+id/color_adjustment_button"
+        android:text="@string/color_adjustment_button"
+        style="@style/FunctionButton.Normal" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/execute_button"
+        android:text="@string/execute_button"
+        style="@style/FunctionButton.Execute" />
 </LinearLayout>

app/src/main/res/layout/ink_item.xml

@@ -1,13 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <ImageView android:background="@color/all_white" android:layout_width="match_parent" android:layout_height="3dp"/>
-    <LinearLayout android:gravity="right|center_vertical|center_horizontal|center" android:orientation="horizontal" android:background="@color/light_gray" android:layout_width="match_parent" android:layout_height="28dp">
-        <TextView android:textSize="12sp" android:textColor="@color/all_black" android:gravity="right|center_vertical|center_horizontal|center" android:id="@+id/ink_name" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginRight="10dp" android:text="Cyan"/>
-        <RelativeLayout android:id="@+id/ink_holder" android:background="@color/all_white" android:layout_width="100dp" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginTop="2dp" android:layout_marginRight="2dp" android:layout_marginBottom="2dp">
-            <FrameLayout android:orientation="horizontal" android:id="@+id/ink_level" android:background="@color/all_black" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginTop="2dp" android:layout_marginRight="2dp" android:layout_marginBottom="2dp" android:layout_alignParentLeft="true">
-                <View android:id="@+id/white_ink_level" android:background="@color/all_white" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="1dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/all_white"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:background="@color/all_white"
+        android:layout_width="match_parent"
+        android:layout_height="3dp" />
+
+    <LinearLayout
+        android:gravity="right|center_vertical|center_horizontal|center"
+        android:orientation="horizontal"
+        android:background="@color/light_gray"
+        android:layout_width="match_parent"
+        android:layout_height="28dp">
+
+        <TextView
+            android:textSize="12sp"
+            android:textColor="@color/all_black"
+            android:gravity="right|center_vertical|center_horizontal|center"
+            android:id="@+id/ink_name"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:text="Cyan" />
+
+        <RelativeLayout
+            android:id="@+id/ink_holder"
+            android:background="@color/all_white"
+            android:layout_width="100dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_marginBottom="2dp">
+
+            <FrameLayout
+                android:orientation="horizontal"
+                android:id="@+id/ink_level"
+                android:background="@color/all_black"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_marginBottom="2dp"
+                android:layout_alignParentLeft="true">
+
+                <View
+                    android:id="@+id/white_ink_level"
+                    android:background="@color/all_white"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="1dp" />
             </FrameLayout>
-            <ImageView android:id="@+id/ink_error" android:visibility="gone" android:layout_width="25dp" android:layout_height="25dp" android:src="@drawable/ink_error" android:scaleType="fitXY" android:layout_centerInParent="true"/>
+
+            <ImageView
+                android:id="@+id/ink_error"
+                android:visibility="gone"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@drawable/ink_error"
+                android:scaleType="fitXY"
+                android:layout_centerInParent="true" />
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/ipprinter_setting_layout.xml

@@ -1,20 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <LinearLayout android:orientation="vertical" android:id="@+id/printerNameArea" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/printer_name_text" android:layout_width="match_parent" android:layout_height="45dp" android:layout_marginLeft="8dp" android:layout_marginTop="5dp" android:text="@string/epsonconnect_str_printer_name"/>
-                <FrameLayout android:id="@+id/printer_name_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                    <EditText android:textSize="18dp" android:id="@+id/printer_name_edit" android:background="@drawable/setting_border" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingRight="35dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="48dp" android:singleLine="true" android:maxLength="63"/>
-                    <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_printer_name_btn" android:background="@drawable/clear_text" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/printerNameArea"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:textSize="17sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:id="@+id/printer_name_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/epsonconnect_str_printer_name" />
+
+                <FrameLayout
+                    android:id="@+id/printer_name_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="5dp">
+
+                    <EditText
+                        android:textSize="18dp"
+                        android:id="@+id/printer_name_edit"
+                        android:background="@drawable/setting_border"
+                        android:paddingLeft="5dp"
+                        android:paddingTop="5dp"
+                        android:paddingRight="35dp"
+                        android:paddingBottom="5dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:singleLine="true"
+                        android:maxLength="63" />
+
+                    <Button
+                        android:textColor="@color/black"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/clear_printer_name_btn"
+                        android:background="@drawable/clear_text"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginRight="5dp" />
                 </FrameLayout>
             </LinearLayout>
-            <LinearLayout android:orientation="vertical" android:id="@+id/iPAdressArea" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="17sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_width="match_parent" android:layout_height="45dp" android:layout_marginLeft="8dp" android:layout_marginTop="20dp" android:text="@string/str_ipprinter_ip"/>
-                <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_marginRight="5dp">
-                    <EditText android:textSize="18sp" android:id="@+id/printer_ip_address_edit" android:background="@drawable/setting_border" android:paddingLeft="5dp" android:paddingTop="5dp" android:paddingRight="35dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="48dp" android:singleLine="true" android:maxLength="15"/>
-                    <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_printer_ip_address_btn" android:background="@drawable/clear_text" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/iPAdressArea"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:textSize="17sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginTop="20dp"
+                    android:text="@string/str_ipprinter_ip" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="5dp">
+
+                    <EditText
+                        android:textSize="18sp"
+                        android:id="@+id/printer_ip_address_edit"
+                        android:background="@drawable/setting_border"
+                        android:paddingLeft="5dp"
+                        android:paddingTop="5dp"
+                        android:paddingRight="35dp"
+                        android:paddingBottom="5dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:singleLine="true"
+                        android:maxLength="15" />
+
+                    <Button
+                        android:textColor="@color/black"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/clear_printer_ip_address_btn"
+                        android:background="@drawable/clear_text"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginRight="5dp" />
                 </FrameLayout>
             </LinearLayout>
         </LinearLayout>

app/src/main/res/layout/iprint_home_layout.xml

@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="@color/epson_lib_clean" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <include layout="@layout/home_top"/>
-    <FrameLayout android:id="@+id/fl_menulist" android:layout_width="match_parent" android:layout_height="match_parent">
-        <com.felipecsl.asymmetricgridview.library.widget.AsymmetricGridView android:id="@+id/menu_list" android:background="@color/all_white" android:scrollbars="none" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="15dp" android:layout_marginTop="15dp" android:layout_marginRight="15dp" android:divider="@android:color/transparent" android:dividerHeight="3dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/epson_lib_clean"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <include layout="@layout/home_top" />
+
+    <FrameLayout
+        android:id="@+id/fl_menulist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.felipecsl.asymmetricgridview.library.widget.AsymmetricGridView
+            android:id="@+id/menu_list"
+            android:background="@color/all_white"
+            android:scrollbars="none"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="15dp"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="3dp" />
     </FrameLayout>
 </LinearLayout>

app/src/main/res/layout/iprintconnect.xml

@@ -1,16 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:id="@+id/scrollView1" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_above="@+id/toolbar" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:paddingLeft="20dp" android:paddingTop="15dp" android:paddingRight="20dp" android:paddingBottom="15dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView1" android:paddingBottom="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_iprintconnect1"/>
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView2" android:paddingTop="15dp" android:paddingBottom="25dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_iprintconnect2"/>
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView3" android:paddingTop="15dp" android:paddingBottom="25dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView4" android:paddingTop="15dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <ProgressBar android:layout_gravity="center" android:id="@+id/progressBarGetConnectStrings" android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:attr/progressBarStyleInverse"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/toolbar"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingTop="15dp"
+            android:paddingRight="20dp"
+            android:paddingBottom="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView1"
+                android:paddingBottom="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_iprintconnect1" />
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView2"
+                android:paddingTop="15dp"
+                android:paddingBottom="25dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_iprintconnect2" />
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView3"
+                android:paddingTop="15dp"
+                android:paddingBottom="25dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView4"
+                android:paddingTop="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <ProgressBar
+                android:layout_gravity="center"
+                android:id="@+id/progressBarGetConnectStrings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/progressBarStyleInverse" />
         </LinearLayout>
     </ScrollView>
-    <RelativeLayout android:id="@+id/toolbar" android:visibility="gone" style="@style/FunctionBar">
-        <Button android:id="@+id/btn_finish" android:text="@string/str_done" android:layout_alignParentRight="true" style="@style/FunctionButton.Execute"/>
+
+    <RelativeLayout
+        android:id="@+id/toolbar"
+        android:visibility="gone"
+        style="@style/FunctionBar">
+
+        <Button
+            android:id="@+id/btn_finish"
+            android:text="@string/str_done"
+            android:layout_alignParentRight="true"
+            style="@style/FunctionButton.Execute" />
     </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/iprintconnect_start.xml

@@ -1,16 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:id="@+id/scrollView1" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_above="@+id/toolbar" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:paddingLeft="20dp" android:paddingTop="15dp" android:paddingRight="20dp" android:paddingBottom="15dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView1" android:paddingBottom="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_iprintconnect_start1"/>
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView2" android:paddingTop="15dp" android:paddingBottom="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_iprintconnect_start2"/>
-            <ImageView android:id="@+id/imageView2" android:layout_width="200dp" android:layout_height="80dp" android:layout_marginLeft="20dp" android:src="@drawable/btn_iprintcon" android:scaleType="centerInside"/>
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView3" android:paddingTop="15dp" android:paddingBottom="25dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_iprintconnect_start3"/>
-            <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:id="@+id/textView4" android:paddingTop="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/str_iprintconnect_start4"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/toolbar"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingTop="15dp"
+            android:paddingRight="20dp"
+            android:paddingBottom="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView1"
+                android:paddingBottom="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_iprintconnect_start1" />
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView2"
+                android:paddingTop="15dp"
+                android:paddingBottom="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_iprintconnect_start2" />
+
+            <ImageView
+                android:id="@+id/imageView2"
+                android:layout_width="200dp"
+                android:layout_height="80dp"
+                android:layout_marginLeft="20dp"
+                android:src="@drawable/btn_iprintcon"
+                android:scaleType="centerInside" />
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView3"
+                android:paddingTop="15dp"
+                android:paddingBottom="25dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_iprintconnect_start3" />
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@android:color/black"
+                android:id="@+id/textView4"
+                android:paddingTop="15dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/str_iprintconnect_start4" />
         </LinearLayout>
     </ScrollView>
-    <RelativeLayout android:id="@+id/toolbar" android:visibility="gone" style="@style/FunctionBar">
-        <Button android:id="@+id/btn_next" android:text="@string/str_next" android:layout_alignParentRight="true" style="@style/FunctionButton.Execute"/>
+
+    <RelativeLayout
+        android:id="@+id/toolbar"
+        android:visibility="gone"
+        style="@style/FunctionBar">
+
+        <Button
+            android:id="@+id/btn_next"
+            android:text="@string/str_next"
+            android:layout_alignParentRight="true"
+            style="@style/FunctionButton.Execute" />
     </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/line.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="1dp">
-    <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="5dp"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="1dp">
+
+    <View
+        android:background="@color/light"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="5dp" />
 </FrameLayout>

app/src/main/res/layout/listitem_device.xml

@@ -1,11 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:paddingLeft="10dp" android:paddingRight="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false">
-    <ImageView android:layout_gravity="center" android:id="@+id/signal" android:layout_width="20dp" android:layout_height="20dp" app:srcCompat="@drawable/signal_3"/>
-    <LinearLayout android:orientation="vertical" android:paddingLeft="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1">
-        <TextView android:textSize="20sp" android:id="@+id/device_name" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-        <TextView android:textSize="14sp" android:id="@+id/device_address" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false">
+
+    <ImageView
+        android:layout_gravity="center"
+        android:id="@+id/signal"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        app:srcCompat="@drawable/signal_3" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <TextView
+            android:textSize="20sp"
+            android:id="@+id/device_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:textSize="14sp"
+            android:id="@+id/device_address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
     </LinearLayout>
-    <LinearLayout android:gravity="right" android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content">
-        <TextView android:textSize="14sp" android:gravity="right" android:id="@+id/device_rssi" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:gravity="right"
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:textSize="14sp"
+            android:gravity="right"
+            android:id="@+id/device_rssi"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/listitem_image_folder.xml

@@ -1,8 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="@color/epson_lib_clean" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ImageView android:layout_gravity="center_vertical" android:id="@+id/imageView" android:layout_width="@dimen/image_selector_list_size" android:layout_height="@dimen/image_selector_list_size" android:src="@android:drawable/ic_menu_set_as" android:scaleType="centerCrop"/>
-    <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:paddingLeft="16dp" android:layout_width="match_parent" android:layout_height="match_parent">
-        <TextView android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/folderNameText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Large Text" android:singleLine="true" android:nestedScrollingEnabled="true"/>
-        <TextView android:textAppearance="?android:attr/textAppearanceMedium" android:id="@+id/imageVolumeText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="Medium Text"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:background="@color/epson_lib_clean"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_gravity="center_vertical"
+        android:id="@+id/imageView"
+        android:layout_width="@dimen/image_selector_list_size"
+        android:layout_height="@dimen/image_selector_list_size"
+        android:src="@android:drawable/ic_menu_set_as"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:id="@+id/folderNameText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Large Text"
+            android:singleLine="true"
+            android:nestedScrollingEnabled="true" />
+
+        <TextView
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/imageVolumeText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:text="Medium Text" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/login_screen_layout.xml

@@ -1,15 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/login_basic_screen" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <TextView android:textSize="20dp" android:textStyle="bold" android:textColor="@color/text_color" android:layout_gravity="left|center_vertical|center_horizontal|center" android:id="@+id/login_username_label" android:paddingLeft="15dp" android:paddingRight="15dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/username_label"/>
-    <FrameLayout android:layout_gravity="right|center_vertical|center_horizontal|center" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="match_parent" android:layout_height="50dp" android:layout_marginTop="5dp">
-        <EditText android:textColor="@color/text_color" android:id="@+id/login_username_content" android:background="@drawable/listitem_bg" android:paddingRight="35dp" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true"/>
-        <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_id_btn" android:background="@drawable/clear_text" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:id="@+id/login_basic_screen"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <TextView
+        android:textSize="20dp"
+        android:textStyle="bold"
+        android:textColor="@color/text_color"
+        android:layout_gravity="left|center_vertical|center_horizontal|center"
+        android:id="@+id/login_username_label"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/username_label" />
+
+    <FrameLayout
+        android:layout_gravity="right|center_vertical|center_horizontal|center"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginTop="5dp">
+
+        <EditText
+            android:textColor="@color/text_color"
+            android:id="@+id/login_username_content"
+            android:background="@drawable/listitem_bg"
+            android:paddingRight="35dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:singleLine="true" />
+
+        <Button
+            android:textColor="@color/black"
+            android:gravity="right|center_vertical|center_horizontal|center"
+            android:layout_gravity="right|center_vertical|center_horizontal|center"
+            android:id="@+id/clear_id_btn"
+            android:background="@drawable/clear_text"
+            android:visibility="gone"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginRight="5dp" />
     </FrameLayout>
-    <TextView android:textSize="20dp" android:textStyle="bold" android:textColor="@color/text_color" android:layout_gravity="left|center_vertical|center_horizontal|center" android:id="@+id/login_password_label" android:paddingLeft="15dp" android:paddingRight="15dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/password_label"/>
-    <FrameLayout android:layout_gravity="right|center_vertical|center_horizontal|center" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="match_parent" android:layout_height="50dp" android:layout_marginTop="5dp">
-        <EditText android:textColor="@color/text_color" android:id="@+id/login_password_content" android:background="@drawable/listitem_bg" android:paddingRight="35dp" android:layout_width="match_parent" android:layout_height="match_parent" android:password="true" android:singleLine="true"/>
-        <Button android:textColor="@color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/clear_password_btn" android:background="@drawable/clear_text" android:visibility="gone" android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="5dp"/>
+
+    <TextView
+        android:textSize="20dp"
+        android:textStyle="bold"
+        android:textColor="@color/text_color"
+        android:layout_gravity="left|center_vertical|center_horizontal|center"
+        android:id="@+id/login_password_label"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/password_label" />
+
+    <FrameLayout
+        android:layout_gravity="right|center_vertical|center_horizontal|center"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginTop="5dp">
+
+        <EditText
+            android:textColor="@color/text_color"
+            android:id="@+id/login_password_content"
+            android:background="@drawable/listitem_bg"
+            android:paddingRight="35dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:password="true"
+            android:singleLine="true" />
+
+        <Button
+            android:textColor="@color/black"
+            android:gravity="right|center_vertical|center_horizontal|center"
+            android:layout_gravity="right|center_vertical|center_horizontal|center"
+            android:id="@+id/clear_password_btn"
+            android:background="@drawable/clear_text"
+            android:visibility="gone"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginRight="5dp" />
     </FrameLayout>
-    <TextView android:textSize="20dp" android:textColor="#ff0000" android:gravity="center" android:layout_gravity="center" android:id="@+id/log_in_fail_notification" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/str_log_in_failed"/>
+
+    <TextView
+        android:textSize="20dp"
+        android:textColor="#ff0000"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/log_in_fail_notification"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="@string/str_log_in_failed" />
 </LinearLayout>

app/src/main/res/layout/main_support.xml

@@ -1,44 +1,252 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:id="@+id/scroll" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-            <LinearLayout android:id="@+id/linearLayoutIprintNews" android:layout_marginTop="20dp" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/iprint_announce_title" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayoutFAQ" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_faq" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/support_faq" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayoutTutorial" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/support_tutorial" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayoutLicense" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_license" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/EULA_Title" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/ossLicenseLayout" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/oss_license_title_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/OSS_License_Title" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayoutPrivacy" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_privacy" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/str_privacy" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayoutSendUageinformation" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_send_usageinformation" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/GALicense_Label" android:layout_weight="1"/>
-                <epson.print.widgets.SwichClickable android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/tb_send_usageinformation" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:layout_marginRight="8dp"/>
-            </LinearLayout>
-            <LinearLayout android:id="@+id/linearLayoutDeviceInformation" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_DeviceInformation" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/str_deviceInformation_Info" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
-            </LinearLayout>
-            <View android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"/>
-            <LinearLayout android:id="@+id/linearLayoutAbout" style="@style/information_button_layout">
-                <TextView android:textSize="18dp" android:textStyle="bold" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:id="@+id/tv_about" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="@string/tv_help_about" android:layout_weight="1"/>
-                <ImageView android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="center_vertical" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:id="@+id/scroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:id="@+id/linearLayoutIprintNews"
+                android:layout_marginTop="20dp"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/iprint_announce_title"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutFAQ"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_faq"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/support_faq"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutTutorial"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/support_tutorial"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutLicense"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_license"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/EULA_Title"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ossLicenseLayout"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/oss_license_title_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/OSS_License_Title"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutPrivacy"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_privacy"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/str_privacy"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutSendUageinformation"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_send_usageinformation"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/GALicense_Label"
+                    android:layout_weight="1" />
+
+                <epson.print.widgets.SwichClickable
+                    android:gravity="center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tb_send_usageinformation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginRight="8dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutDeviceInformation"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_DeviceInformation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/str_deviceInformation_Info"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:id="@+id/linearLayoutAbout"
+                style="@style/information_button_layout">
+
+                <TextView
+                    android:textSize="18dp"
+                    android:textStyle="bold"
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/tv_about"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/tv_help_about"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:gravity="right|center_vertical|center_horizontal|center"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="31dp"
+                    android:layout_height="31dp"
+                    android:src="@drawable/next_screen"
+                    android:scaleType="fitXY" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/main_webview.xml

@@ -1,14 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/webview" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <LinearLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/ln_input_url" android:background="@color/all_white" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-        <EditText android:id="@+id/te_url" android:paddingRight="38dp" android:layout_width="0dp" android:layout_height="45dp" android:singleLine="true" android:layout_weight="1" android:inputType="textUri"/>
-        <ImageButton android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/btn_clear_url" android:focusableInTouchMode="true" android:layout_width="38dp" android:layout_height="38dp" android:layout_marginRight="0dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:id="@+id/webview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <LinearLayout
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:id="@+id/ln_input_url"
+        android:background="@color/all_white"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="45dp">
+
+        <EditText
+            android:id="@+id/te_url"
+            android:paddingRight="38dp"
+            android:layout_width="0dp"
+            android:layout_height="45dp"
+            android:singleLine="true"
+            android:layout_weight="1"
+            android:inputType="textUri" />
+
+        <ImageButton
+            android:gravity="right|center_vertical|center_horizontal|center"
+            android:layout_gravity="right|center_vertical|center_horizontal|center"
+            android:id="@+id/btn_clear_url"
+            android:focusableInTouchMode="true"
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:layout_marginRight="0dp" />
     </LinearLayout>
-    <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent">
-        <WebView android:id="@+id/web_engine" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
-        <LinearLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/layout_loading" android:background="@color/all_transparent" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent">
-            <ProgressBar android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <WebView
+            android:id="@+id/web_engine"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:id="@+id/layout_loading"
+            android:background="@color/all_transparent"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </FrameLayout>
 </LinearLayout>

app/src/main/res/layout/maintain.xml

@@ -1,96 +1,743 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_below="@+id/navigation_bar">
-        <LinearLayout android:orientation="vertical" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <LinearLayout android:orientation="vertical" android:background="@drawable/listitem_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp">
-                <LinearLayout android:orientation="horizontal" android:id="@+id/printer" android:background="@drawable/select_setting_border" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/printer"/>
-                    <TextView android:textSize="16sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/printer_name" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:layout_marginRight="5dp" android:text="@string/str_lbl_title_scan" android:singleLine="true" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/imageViewPrinterLocation" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/print_local"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_below="@+id/navigation_bar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:background="@drawable/listitem_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/printer"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:text="@string/printer" />
+
+                    <TextView
+                        android:textSize="16sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right"
+                        android:id="@+id/printer_name"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="5dp"
+                        android:text="@string/str_lbl_title_scan"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:id="@+id/imageViewPrinterLocation"
+                        android:visibility="gone"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/print_local" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/serial_separator" android:background="@color/light" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:orientation="horizontal" android:id="@+id/serial" android:background="@drawable/select_setting_border" android:paddingTop="3dp" android:paddingBottom="3dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/epsonconnect_str_serial_no"/>
-                    <TextView android:textSize="16sp" android:textColor="@android:color/darker_gray" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/serial_no" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:singleLine="true" android:layout_weight="1"/>
+
+                <View
+                    android:id="@+id/serial_separator"
+                    android:background="@color/light"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:id="@+id/serial"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:text="@string/epsonconnect_str_serial_no" />
+
+                    <TextView
+                        android:textSize="16sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:ellipsize="end"
+                        android:gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/serial_no"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:singleLine="true"
+                        android:layout_weight="1" />
                 </LinearLayout>
             </LinearLayout>
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/group_text_color" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" android:text="@string/str_print_status"/>
-            <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/status" android:background="@drawable/listitem_bg" android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="top" android:layout_gravity="left" android:id="@+id/printer_status" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="25dp"/>
-                    <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                    <TextView android:textSize="16sp" android:textColor="@android:color/darker_gray" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:id="@+id/printer_status_detail" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="25dp" android:drawablePadding="10dp"/>
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@color/group_text_color"
+                android:gravity="center_vertical"
+                android:layout_gravity="left"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/str_print_status" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="vertical"
+                    android:id="@+id/status"
+                    android:background="@drawable/listitem_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="top"
+                        android:layout_gravity="left"
+                        android:id="@+id/printer_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minHeight="25dp" />
+
+                    <View
+                        android:background="@color/light"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp" />
+
+                    <TextView
+                        android:textSize="16sp"
+                        android:textColor="@android:color/darker_gray"
+                        android:gravity="left|center_vertical|center_horizontal|center"
+                        android:layout_gravity="left"
+                        android:id="@+id/printer_status_detail"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="25dp"
+                        android:drawablePadding="10dp" />
                 </LinearLayout>
-                <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
-                    <ProgressBar android:id="@+id/progress_status" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true">
+
+                    <ProgressBar
+                        android:id="@+id/progress_status"
+                        android:visibility="gone"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
             </RelativeLayout>
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/group_text_color" android:gravity="center_vertical" android:layout_gravity="left" android:id="@+id/ink_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" android:text="@string/str_remain_ink"/>
-            <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/ink_view_ln" android:background="@drawable/listitem_bg" android:paddingLeft="10dp" android:paddingTop="5dp" android:paddingRight="10dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/group_text_color" android:gravity="center_vertical" android:layout_gravity="left" android:id="@+id/maintenance_box_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" android:text="@string/maintenance_box_info"/>
-            <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/maintenance_box_info_layout" android:background="@drawable/listitem_bg" android:paddingLeft="10dp" android:paddingTop="5dp" android:paddingRight="10dp" android:paddingBottom="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp"/>
-            <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/mentenance_buy_ink_frame" android:background="@drawable/listitem_bg" android:padding="10dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/mentenance_buy_ink" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_buy_ink" android:layout_width="0dp" android:layout_height="match_parent" android:text="@string/support_buy_ink" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/buy_ink_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@color/group_text_color"
+                android:gravity="center_vertical"
+                android:layout_gravity="left"
+                android:id="@+id/ink_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/str_remain_ink" />
+
+            <LinearLayout
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:id="@+id/ink_view_ln"
+                android:background="@drawable/listitem_bg"
+                android:paddingLeft="10dp"
+                android:paddingTop="5dp"
+                android:paddingRight="10dp"
+                android:paddingBottom="12dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@color/group_text_color"
+                android:gravity="center_vertical"
+                android:layout_gravity="left"
+                android:id="@+id/maintenance_box_text"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/maintenance_box_info" />
+
+            <LinearLayout
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:id="@+id/maintenance_box_info_layout"
+                android:background="@drawable/listitem_bg"
+                android:paddingLeft="10dp"
+                android:paddingTop="5dp"
+                android:paddingRight="10dp"
+                android:paddingBottom="12dp"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp" />
+
+            <LinearLayout
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:id="@+id/mentenance_buy_ink_frame"
+                android:background="@drawable/listitem_bg"
+                android:padding="10dp"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/mentenance_buy_ink"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_buy_ink"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:text="@string/support_buy_ink"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/buy_ink_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/buy_ink_separator" android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/maintenance_inkds" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_inkds" android:layout_width="0dp" android:layout_height="match_parent" android:text="@string/ready_ink_button_name" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/inkds_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/buy_ink_separator"
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/maintenance_inkds"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_inkds"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:text="@string/ready_ink_button_name"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/inkds_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/group_text_color" android:gravity="center_vertical" android:layout_gravity="left" android:id="@+id/bt_PowerText" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" android:text="@string/bi_title"/>
-            <ListView android:id="@+id/battery_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginTop="10dp" android:layout_marginRight="4dp"/>
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/group_text_color" android:gravity="center_vertical" android:layout_gravity="left" android:id="@+id/text_maintenance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" android:text="@string/str_maintenance"/>
-            <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/clean_check" android:background="@drawable/listitem_bg" android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/head_clean_view" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/head_clean_text" android:layout_width="0dp" android:layout_height="match_parent" android:text="@string/str_head_clean" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/head_clean_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@color/group_text_color"
+                android:gravity="center_vertical"
+                android:layout_gravity="left"
+                android:id="@+id/bt_PowerText"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/bi_title" />
+
+            <ListView
+                android:id="@+id/battery_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="4dp" />
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@color/group_text_color"
+                android:gravity="center_vertical"
+                android:layout_gravity="left"
+                android:id="@+id/text_maintenance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/str_maintenance" />
+
+            <LinearLayout
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:id="@+id/clean_check"
+                android:background="@drawable/listitem_bg"
+                android:padding="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/head_clean_view"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/head_clean_text"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:text="@string/str_head_clean"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/head_clean_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/nozzle_check_view" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/nozzle_check_text" android:layout_width="0dp" android:layout_height="match_parent" android:text="@string/str_nozzle_check" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/nozzle_check_view"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/nozzle_check_text"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:text="@string/str_nozzle_check"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/fwupdate_view" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/fwupdate_text" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/fw_buttonname" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/fwupdate_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/fwupdate_view"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/fwupdate_text"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/fw_buttonname"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/fwupdate_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/group_text_color" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" android:text="@string/str_settings"/>
-            <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/setting_view_ln" android:background="@drawable/listitem_bg" android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/print_preview" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_print_preview" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/epsonconnect_str_epsonconnect_usepreview" android:layout_weight="1"/>
-                    <epson.print.widgets.SwichClickable android:id="@+id/togglePreview" android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" android:scaleType="fitXY" android:textOn="@string/EPS_CONNECT_CORRECT" android:textOff="@string/EPS_CONNECT_NOTHING"/>
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@color/group_text_color"
+                android:gravity="center_vertical"
+                android:layout_gravity="left"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/str_settings" />
+
+            <LinearLayout
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:id="@+id/setting_view_ln"
+                android:background="@drawable/listitem_bg"
+                android:padding="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/print_preview"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_print_preview"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/epsonconnect_str_epsonconnect_usepreview"
+                        android:layout_weight="1" />
+
+                    <epson.print.widgets.SwichClickable
+                        android:id="@+id/togglePreview"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:scaleType="fitXY"
+                        android:textOn="@string/EPS_CONNECT_CORRECT"
+                        android:textOff="@string/EPS_CONNECT_NOTHING" />
                 </LinearLayout>
-                <View android:id="@+id/comm_messeage_separator" android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/alert_messeage" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_alert_messeage" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/epsonconnect_str_epsonconnect_alertmessage" android:layout_weight="1"/>
-                    <epson.print.widgets.SwichClickable android:id="@+id/toggleAlert" android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" android:scaleType="fitXY" android:textOn="@string/EPS_CONNECT_CORRECT" android:textOff="@string/EPS_CONNECT_NOTHING"/>
+
+                <View
+                    android:id="@+id/comm_messeage_separator"
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/alert_messeage"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_alert_messeage"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/epsonconnect_str_epsonconnect_alertmessage"
+                        android:layout_weight="1" />
+
+                    <epson.print.widgets.SwichClickable
+                        android:id="@+id/toggleAlert"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:scaleType="fitXY"
+                        android:textOn="@string/EPS_CONNECT_CORRECT"
+                        android:textOff="@string/EPS_CONNECT_NOTHING" />
                 </LinearLayout>
-                <View android:id="@+id/printer_setting_separator" android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/printer_setting" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_printer_setting" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/maintenance_advanced_settings" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/printer_setting_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/printer_setting_separator"
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/printer_setting"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_printer_setting"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/maintenance_advanced_settings"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/printer_setting_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/epsonconnect_separator" android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/epsonconnect_option" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:clickable="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@color/light_gray" android:gravity="center_vertical" android:id="@+id/text_epson_connect" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/ec_registration" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/epsonconnect_arrow" android:visibility="gone" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/epsonconnect_separator"
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/epsonconnect_option"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:clickable="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@color/light_gray"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_epson_connect"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ec_registration"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/epsonconnect_arrow"
+                        android:visibility="gone"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/online_registration_separator" android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/online_registration" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_online_registration" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/str_online_registration" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/online_registration_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/online_registration_separator"
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/online_registration"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_online_registration"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_online_registration"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/online_registration_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
-                <View android:id="@+id/print_history_separator" android:background="@color/light" android:paddingTop="10dp" android:paddingBottom="10dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/print_history" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/text_print_history" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/epsonconnect_str_print_history" android:layout_weight="1"/>
-                    <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/print_history_arrow" android:layout_width="31dp" android:layout_height="31dp" android:src="@drawable/next_screen" android:scaleType="fitXY"/>
+
+                <View
+                    android:id="@+id/print_history_separator"
+                    android:background="@color/light"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <LinearLayout
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:id="@+id/print_history"
+                    android:background="@drawable/select_setting_border"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="45dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:id="@+id/text_print_history"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/epsonconnect_str_print_history"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_gravity="right|center_vertical|center_horizontal|center"
+                        android:id="@+id/print_history_arrow"
+                        android:layout_width="31dp"
+                        android:layout_height="31dp"
+                        android:src="@drawable/next_screen"
+                        android:scaleType="fitXY" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>

app/src/main/res/layout/maintain_battery_info.xml

@@ -1,10 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:orientation="vertical" android:id="@+id/bt_PowerDetail" android:background="@drawable/listitem_bg" android:padding="0dp" android:visibility="visible" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/bt_BatteryStatus" android:background="@drawable/select_setting_border" android:paddingLeft="3dp" android:paddingTop="3dp" android:paddingBottom="3dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="45dp">
-        <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:id="@+id/bt_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/bi_remain" android:layout_weight="1" android:layout_marginStart="5dp"/>
-        <LinearLayout android:layout_width="wrap_content" android:layout_height="match_parent">
-            <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/bt_percentage" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.51"/>
-            <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/bt_status_icon" android:layout_width="50dp" android:layout_height="33dp" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:src="@drawable/bi_running_0" android:scaleType="fitXY"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:id="@+id/bt_PowerDetail"
+    android:background="@drawable/listitem_bg"
+    android:padding="0dp"
+    android:visibility="visible"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:id="@+id/bt_BatteryStatus"
+        android:background="@drawable/select_setting_border"
+        android:paddingLeft="3dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="45dp">
+
+        <TextView
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:textColor="@android:color/black"
+            android:gravity="center_vertical"
+            android:id="@+id/bt_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bi_remain"
+            android:layout_weight="1"
+            android:layout_marginStart="5dp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                android:gravity="right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/bt_percentage"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.51" />
+
+            <ImageView
+                android:layout_gravity="right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/bt_status_icon"
+                android:layout_width="50dp"
+                android:layout_height="33dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:src="@drawable/bi_running_0"
+                android:scaleType="fitXY" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/maintain_executing_dialog.xml

@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:orientation="vertical" android:id="@+id/layout_root" android:background="#88000000" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textColor="@color/all_white" android:id="@+id/loading_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/str_executing"/>
-    <ProgressBar android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="50dp"/>
-    <Button android:textSize="18dp" android:gravity="center" android:id="@+id/close_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@string/str_btn_close"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:id="@+id/layout_root"
+    android:background="#88000000"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textColor="@color/all_white"
+        android:id="@+id/loading_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/str_executing" />
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp" />
+
+    <Button
+        android:textSize="18dp"
+        android:gravity="center"
+        android:id="@+id/close_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/str_btn_close" />
 </LinearLayout>

app/src/main/res/layout/memcard_card_grid_view_elem.xml

@@ -1,6 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_width="@dimen/image_selector_grid_thumbnail_size" android:layout_height="@dimen/image_selector_grid_thumbnail_size">
-    <ImageView android:id="@+id/thumbNail" android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/image" android:scaleType="centerCrop" android:contentDescription="Thumbnail"/>
-    <ImageView android:layout_gravity="top|left|center_vertical|center_horizontal|center" android:id="@+id/checkImage" android:layout_width="@dimen/imgsel_grid_sel_icon_size" android:layout_height="@dimen/imgsel_grid_sel_icon_size" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:src="@drawable/check_selected" android:scaleType="fitXY" android:contentDescription="check"/>
-    <TextView android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/black" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@+id/baseDirText" android:padding="12dp" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Small Text" android:maxLines="3" android:scrollHorizontally="true"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:layout_width="@dimen/image_selector_grid_thumbnail_size"
+    android:layout_height="@dimen/image_selector_grid_thumbnail_size">
+
+    <ImageView
+        android:id="@+id/thumbNail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/image"
+        android:scaleType="centerCrop"
+        android:contentDescription="Thumbnail" />
+
+    <ImageView
+        android:layout_gravity="top|left|center_vertical|center_horizontal|center"
+        android:id="@+id/checkImage"
+        android:layout_width="@dimen/imgsel_grid_sel_icon_size"
+        android:layout_height="@dimen/imgsel_grid_sel_icon_size"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:src="@drawable/check_selected"
+        android:scaleType="fitXY"
+        android:contentDescription="check" />
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/black"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/baseDirText"
+        android:padding="12dp"
+        android:visibility="invisible"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Small Text"
+        android:maxLines="3"
+        android:scrollHorizontally="true" />
 </FrameLayout>

app/src/main/res/layout/memcard_folder.xml

@@ -1,10 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="#000" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ProgressBar android:layout_gravity="center" android:id="@+id/progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <GridView android:gravity="center" android:id="@+id/grv_list_album" android:paddingTop="5dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="0dp" android:horizontalSpacing="5dp" android:verticalSpacing="10dp" android:columnWidth="115dp" android:numColumns="auto_fit" android:layout_weight="1"/>
-    <LinearLayout android:id="@+id/function_bar" style="@style/FunctionBar">
-        <TextView android:id="@+id/textSelectedNum" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="5sp" android:text="@string/app_name" android:layout_weight="1" style="@style/FunctionBarText"/>
-        <Button android:id="@+id/nextButton" android:text="@string/str_next" android:onClick="next_button_clicked" style="@style/FunctionButton.Normal"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="#000"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <GridView
+        android:gravity="center"
+        android:id="@+id/grv_list_album"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:horizontalSpacing="5dp"
+        android:verticalSpacing="10dp"
+        android:columnWidth="115dp"
+        android:numColumns="auto_fit"
+        android:layout_weight="1" />
+
+    <LinearLayout
+        android:id="@+id/function_bar"
+        style="@style/FunctionBar">
+
+        <TextView
+            android:id="@+id/textSelectedNum"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5sp"
+            android:text="@string/app_name"
+            android:layout_weight="1"
+            style="@style/FunctionBarText" />
+
+        <Button
+            android:id="@+id/nextButton"
+            android:text="@string/str_next"
+            android:onClick="next_button_clicked"
+            style="@style/FunctionButton.Normal" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/memcard_folder_list.xml

@@ -1,13 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal" android:orientation="vertical" android:id="@+id/rl_item_contain" android:background="@color/all_black" android:layout_width="110dp" android:layout_height="140dp">
-    <LinearLayout android:gravity="center" android:id="@+id/rl_album_border" android:background="@drawable/album_border" android:layout_width="110dp" android:layout_height="110dp">
-        <RelativeLayout android:id="@+id/rl_album_icon" android:background="@color/all_black" android:layout_width="110dp" android:layout_height="110dp">
-            <ImageView android:id="@+id/imv_icon1" android:background="@color/all_white" android:paddingRight="3dp" android:paddingBottom="3dp" android:layout_width="53dp" android:layout_height="53dp" android:src="@color/all_gray" android:scaleType="centerCrop" android:cropToPadding="true"/>
-            <ImageView android:id="@+id/imv_icon2" android:background="@color/all_white" android:paddingLeft="3dp" android:paddingBottom="3dp" android:layout_width="53dp" android:layout_height="53dp" android:layout_marginLeft="3dp" android:src="@color/all_gray" android:scaleType="centerCrop" android:cropToPadding="true" android:layout_toRightOf="@+id/imv_icon1"/>
-            <ImageView android:id="@+id/imv_icon3" android:background="@color/all_white" android:paddingTop="3dp" android:paddingRight="3dp" android:layout_width="53dp" android:layout_height="53dp" android:layout_marginTop="3dp" android:src="@color/all_gray" android:scaleType="centerCrop" android:cropToPadding="true" android:layout_below="@+id/imv_icon1"/>
-            <ImageView android:id="@+id/imv_icon4" android:background="@color/all_white" android:paddingLeft="3dp" android:paddingTop="3dp" android:layout_width="53dp" android:layout_height="53dp" android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:src="@color/all_gray" android:scaleType="centerCrop" android:cropToPadding="true" android:layout_toRightOf="@+id/imv_icon3" android:layout_below="@+id/imv_icon2"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:id="@+id/rl_item_contain"
+    android:background="@color/all_black"
+    android:layout_width="110dp"
+    android:layout_height="140dp">
+
+    <LinearLayout
+        android:gravity="center"
+        android:id="@+id/rl_album_border"
+        android:background="@drawable/album_border"
+        android:layout_width="110dp"
+        android:layout_height="110dp">
+
+        <RelativeLayout
+            android:id="@+id/rl_album_icon"
+            android:background="@color/all_black"
+            android:layout_width="110dp"
+            android:layout_height="110dp">
+
+            <ImageView
+                android:id="@+id/imv_icon1"
+                android:background="@color/all_white"
+                android:paddingRight="3dp"
+                android:paddingBottom="3dp"
+                android:layout_width="53dp"
+                android:layout_height="53dp"
+                android:src="@color/all_gray"
+                android:scaleType="centerCrop"
+                android:cropToPadding="true" />
+
+            <ImageView
+                android:id="@+id/imv_icon2"
+                android:background="@color/all_white"
+                android:paddingLeft="3dp"
+                android:paddingBottom="3dp"
+                android:layout_width="53dp"
+                android:layout_height="53dp"
+                android:layout_marginLeft="3dp"
+                android:src="@color/all_gray"
+                android:scaleType="centerCrop"
+                android:cropToPadding="true"
+                android:layout_toRightOf="@+id/imv_icon1" />
+
+            <ImageView
+                android:id="@+id/imv_icon3"
+                android:background="@color/all_white"
+                android:paddingTop="3dp"
+                android:paddingRight="3dp"
+                android:layout_width="53dp"
+                android:layout_height="53dp"
+                android:layout_marginTop="3dp"
+                android:src="@color/all_gray"
+                android:scaleType="centerCrop"
+                android:cropToPadding="true"
+                android:layout_below="@+id/imv_icon1" />
+
+            <ImageView
+                android:id="@+id/imv_icon4"
+                android:background="@color/all_white"
+                android:paddingLeft="3dp"
+                android:paddingTop="3dp"
+                android:layout_width="53dp"
+                android:layout_height="53dp"
+                android:layout_marginLeft="3dp"
+                android:layout_marginTop="3dp"
+                android:src="@color/all_gray"
+                android:scaleType="centerCrop"
+                android:cropToPadding="true"
+                android:layout_toRightOf="@+id/imv_icon3"
+                android:layout_below="@+id/imv_icon2" />
         </RelativeLayout>
     </LinearLayout>
-    <TextView android:textSize="14dp" android:textStyle="bold" android:textColor="@color/all_white" android:ellipsize="middle" android:id="@+id/tv_album_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scrollHorizontally="true" android:singleLine="true"/>
-    <TextView android:textSize="12dp" android:textColor="@color/all_white" android:id="@+id/tv_items_count" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
+    <TextView
+        android:textSize="14dp"
+        android:textStyle="bold"
+        android:textColor="@color/all_white"
+        android:ellipsize="middle"
+        android:id="@+id/tv_album_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scrollHorizontally="true"
+        android:singleLine="true" />
+
+    <TextView
+        android:textSize="12dp"
+        android:textColor="@color/all_white"
+        android:id="@+id/tv_items_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </LinearLayout>

app/src/main/res/layout/memcard_gridview.xml

@@ -1,9 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="#000" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <GridView android:gravity="center" android:id="@+id/grv_album_contain" android:paddingTop="5dp" android:paddingBottom="5dp" android:layout_width="match_parent" android:layout_height="0dp" android:horizontalSpacing="5dp" android:verticalSpacing="10dp" android:numColumns="auto_fit" android:layout_weight="1"/>
-    <LinearLayout android:id="@+id/ln_toolbar" style="@style/FunctionBar">
-        <TextView android:gravity="left" android:id="@+id/textSelectedNum" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="5sp" android:text="@string/app_name" android:layout_weight="1" style="@style/FunctionBarText"/>
-        <Button android:id="@+id/btn_next" android:text="@string/str_next" style="@style/FunctionButton.Normal"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="#000"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <GridView
+        android:gravity="center"
+        android:id="@+id/grv_album_contain"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:horizontalSpacing="5dp"
+        android:verticalSpacing="10dp"
+        android:numColumns="auto_fit"
+        android:layout_weight="1" />
+
+    <LinearLayout
+        android:id="@+id/ln_toolbar"
+        style="@style/FunctionBar">
+
+        <TextView
+            android:gravity="left"
+            android:id="@+id/textSelectedNum"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5sp"
+            android:text="@string/app_name"
+            android:layout_weight="1"
+            style="@style/FunctionBarText" />
+
+        <Button
+            android:id="@+id/btn_next"
+            android:text="@string/str_next"
+            style="@style/FunctionButton.Normal" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/memcard_read_progress.xml

@@ -1,9 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:padding="10dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="250dp">
-    <TextView android:textColor="@android:color/white" android:gravity="left|center_vertical|center_horizontal|center" android:layout_gravity="left" android:id="@+id/percent" android:paddingTop="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=""/>
-    <ProgressBar android:id="@+id/progress_percent" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" android:progress="0" style="?android:attr/progressBarStyleHorizontal"/>
-    <TextView android:textColor="@android:color/white" android:gravity="center" android:layout_gravity="left" android:id="@+id/copies" android:paddingTop="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0/1"/>
-    <ProgressBar android:id="@+id/progress_copies" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" android:progress="0" style="?android:attr/progressBarStyleHorizontal"/>
-    <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <Button android:gravity="center" android:layout_gravity="center" android:id="@+id/cancel_button" android:layout_width="wrap_content" android:layout_height="50dp" android:text="@string/str_cancel"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="10dp"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:minWidth="250dp">
+
+    <TextView
+        android:textColor="@android:color/white"
+        android:gravity="left|center_vertical|center_horizontal|center"
+        android:layout_gravity="left"
+        android:id="@+id/percent"
+        android:paddingTop="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="" />
+
+    <ProgressBar
+        android:id="@+id/progress_percent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:progress="0"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <TextView
+        android:textColor="@android:color/white"
+        android:gravity="center"
+        android:layout_gravity="left"
+        android:id="@+id/copies"
+        android:paddingTop="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="0/1" />
+
+    <ProgressBar
+        android:id="@+id/progress_copies"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:progress="0"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/cancel_button"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:text="@string/str_cancel" />
 </LinearLayout>

app/src/main/res/layout/memcard_write_progress.xml

@@ -1,12 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:padding="10dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="250dp">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:gravity="left" android:id="@+id/copyingMessageText" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/memcard_file_writing_message" android:layout_weight="1"/>
-        <TextView android:gravity="left|center_vertical|center_horizontal|center" android:id="@+id/percent" android:paddingTop="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0/0"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="10dp"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:minWidth="250dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:gravity="left"
+            android:id="@+id/copyingMessageText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/memcard_file_writing_message"
+            android:layout_weight="1" />
+
+        <TextView
+            android:gravity="left|center_vertical|center_horizontal|center"
+            android:id="@+id/percent"
+            android:paddingTop="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0/0" />
     </LinearLayout>
-    <ProgressBar android:id="@+id/progress_percent" android:paddingTop="5dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" android:progress="0" style="?android:attr/progressBarStyleHorizontal"/>
-    <TextView android:textColor="@android:color/white" android:gravity="center" android:layout_gravity="left" android:id="@+id/copies" android:paddingTop="10dp" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0/0"/>
-    <ProgressBar android:id="@+id/progress_copies" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" android:progress="0" style="?android:attr/progressBarStyleHorizontal"/>
-    <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <Button android:gravity="center" android:layout_gravity="center" android:id="@+id/cancel_button" android:layout_width="wrap_content" android:layout_height="50dp" android:text="@string/str_cancel"/>
+
+    <ProgressBar
+        android:id="@+id/progress_percent"
+        android:paddingTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:progress="0"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <TextView
+        android:textColor="@android:color/white"
+        android:gravity="center"
+        android:layout_gravity="left"
+        android:id="@+id/copies"
+        android:paddingTop="10dp"
+        android:visibility="invisible"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="0/0" />
+
+    <ProgressBar
+        android:id="@+id/progress_copies"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:progress="0"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/cancel_button"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:text="@string/str_cancel" />
 </LinearLayout>

app/src/main/res/layout/menu_item_btn.xml

@@ -1,7 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:orientation="vertical" android:id="@+id/menu_item_btn" android:padding="2dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ImageView android:id="@+id/screen_image" android:tag="icon" android:layout_width="match_parent" android:layout_height="0dp" android:layout_margin="5dp" android:scaleType="fitCenter" android:layout_weight="0.5"/>
-    <RelativeLayout android:id="@+id/rl_text" android:layout_width="match_parent" android:layout_height="0dp" android:layout_margin="2dp" android:layout_weight="0.5">
-        <epson.print.widgets.JWrapTextView android:textSize="16sp" android:textColor="@android:color/white" android:gravity="center" android:id="@+id/screen_text" android:tag="text" android:layout_width="match_parent" android:layout_height="match_parent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:id="@+id/menu_item_btn"
+    android:padding="2dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/screen_image"
+        android:tag="icon"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_margin="5dp"
+        android:scaleType="fitCenter"
+        android:layout_weight="0.5" />
+
+    <RelativeLayout
+        android:id="@+id/rl_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_margin="2dp"
+        android:layout_weight="0.5">
+
+        <epson.print.widgets.JWrapTextView
+            android:textSize="16sp"
+            android:textColor="@android:color/white"
+            android:gravity="center"
+            android:id="@+id/screen_text"
+            android:tag="text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
     </RelativeLayout>
 </LinearLayout>

app/src/main/res/layout/my_dialog_layout.xml

@@ -1,13 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/CoverProgress">
-    <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@drawable/album_border" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="50dp" android:layout_marginRight="50dp" android:minHeight="250dp">
-        <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@color/dark_gray" android:layout_width="match_parent" android:layout_height="match_parent" android:minHeight="250dp">
-            <TextView android:textSize="25dp" android:textStyle="bold" android:gravity="center" android:layout_gravity="center" android:id="@+id/dialog_title" android:padding="5dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <FrameLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-                <TextView android:textSize="20dp" android:gravity="center" android:id="@+id/dialog_content" android:paddingLeft="7dp" android:paddingRight="7dp" android:layout_width="match_parent" android:layout_height="match_parent"/>
-                <ProgressBar android:layout_gravity="center" android:id="@+id/download_upload_progress" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/CoverProgress">
+
+    <LinearLayout
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:background="@drawable/album_border"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        android:minHeight="250dp">
+
+        <LinearLayout
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:background="@color/dark_gray"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:minHeight="250dp">
+
+            <TextView
+                android:textSize="25dp"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/dialog_title"
+                android:padding="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1">
+
+                <TextView
+                    android:textSize="20dp"
+                    android:gravity="center"
+                    android:id="@+id/dialog_content"
+                    android:paddingLeft="7dp"
+                    android:paddingRight="7dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+                <ProgressBar
+                    android:layout_gravity="center"
+                    android:id="@+id/download_upload_progress"
+                    android:visibility="gone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
             </FrameLayout>
-            <Button android:textSize="18dp" android:gravity="center" android:layout_gravity="center" android:id="@+id/ok" android:layout_width="wrap_content" android:layout_height="60dp" android:layout_marginTop="5dp" android:text="@string/str_ok" android:lines="1"/>
+
+            <Button
+                android:textSize="18dp"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/ok"
+                android:layout_width="wrap_content"
+                android:layout_height="60dp"
+                android:layout_marginTop="5dp"
+                android:text="@string/str_ok"
+                android:lines="1" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/my_progress.xml

@@ -1,9 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:orientation="vertical" android:id="@+id/dialog_back" android:background="#55000000" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/storage_progress_messageTitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp"/>
-    <TextView android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/all_white" android:id="@+id/messageText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp"/>
-    <ProgressBar android:layout_gravity="center" android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" style="?android:attr/progressBarStyle"/>
-    <ProgressBar android:layout_gravity="center" android:id="@+id/storage_progress_horizontalProgressBar" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="30dp" android:layout_marginTop="15dp" android:layout_marginRight="30dp" android:layout_marginBottom="15dp" style="?android:attr/progressBarStyleHorizontal"/>
-    <Button android:gravity="center" android:id="@+id/cancelButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="15dp" android:layout_marginBottom="15dp"/>
-    <View android:layout_width="match_parent" android:layout_height="48dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:id="@+id/dialog_back"
+    android:background="#55000000"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:id="@+id/storage_progress_messageTitle"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp" />
+
+    <TextView
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/all_white"
+        android:id="@+id/messageText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        style="?android:attr/progressBarStyle" />
+
+    <ProgressBar
+        android:layout_gravity="center"
+        android:id="@+id/storage_progress_horizontalProgressBar"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="30dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="15dp"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <Button
+        android:gravity="center"
+        android:id="@+id/cancelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="48dp" />
 </LinearLayout>

app/src/main/res/layout/mylistview.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/fl_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="2dp" android:layout_marginRight="5dp">
-    <ListView android:scrollbarSize="1dp" android:id="@android:id/list" android:background="@drawable/setting_border" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:cacheColorHint="#00000000" android:divider="@color/light" android:dividerHeight="1dp"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fl_list"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="5dp"
+    android:layout_marginTop="2dp"
+    android:layout_marginRight="5dp">
+
+    <ListView
+        android:scrollbarSize="1dp"
+        android:id="@android:id/list"
+        android:background="@drawable/setting_border"
+        android:scrollbars="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:cacheColorHint="#00000000"
+        android:divider="@color/light"
+        android:dividerHeight="1dp" />
 </FrameLayout>

app/src/main/res/layout/notification_media_action.xml

@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/action0" android:layout_width="48dp" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:layout_weight="1" style="?android:attr/borderlessButtonStyle"/>
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:id="@+id/action0"
+    android:layout_width="48dp"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="2dp"
+    android:layout_marginRight="2dp"
+    android:layout_weight="1"
+    style="?android:attr/borderlessButtonStyle" />

app/src/main/res/layout/notification_media_cancel_action.xml

@@ -1,2 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/cancel_action" android:visibility="gone" android:layout_width="48dp" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:src="@android:drawable/ic_menu_close_clear_cancel" android:layout_weight="1" style="?android:attr/borderlessButtonStyle"/>
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:id="@+id/cancel_action"
+    android:visibility="gone"
+    android:layout_width="48dp"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="2dp"
+    android:layout_marginRight="2dp"
+    android:src="@android:drawable/ic_menu_close_clear_cancel"
+    android:layout_weight="1"
+    style="?android:attr/borderlessButtonStyle" />

app/src/main/res/layout/notification_template_big_media.xml

@@ -1,8 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="128dp">
-    <include android:layout_width="@dimen/notification_large_icon_width" android:layout_height="@dimen/notification_large_icon_height" layout="@layout/notification_template_icon_group"/>
-    <include android:layout_width="48dp" android:layout_height="48dp" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" layout="@layout/notification_media_cancel_action"/>
-    <include android:layout_gravity="fill_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_large_icon_width" android:layout_toLeftOf="@+id/cancel_action" android:layout_marginStart="@dimen/notification_large_icon_width" android:layout_toStartOf="@+id/cancel_action" layout="@layout/notification_template_lines_media"/>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/media_actions" android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_alignParentBottom="true" android:layoutDirection="ltr"/>
-    <ImageView android:id="@+id/action_divider" android:background="?android:attr/dividerHorizontal" android:layout_width="match_parent" android:layout_height="1dp" android:layout_above="@+id/media_actions"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="128dp">
+
+    <include
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        layout="@layout/notification_template_icon_group" />
+
+    <include
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        layout="@layout/notification_media_cancel_action" />
+
+    <include
+        android:layout_gravity="fill_vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/notification_large_icon_width"
+        android:layout_toLeftOf="@+id/cancel_action"
+        android:layout_marginStart="@dimen/notification_large_icon_width"
+        android:layout_toStartOf="@+id/cancel_action"
+        layout="@layout/notification_template_lines_media" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/media_actions"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_alignParentBottom="true"
+        android:layoutDirection="ltr" />
+
+    <ImageView
+        android:id="@+id/action_divider"
+        android:background="?android:attr/dividerHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_above="@+id/media_actions" />
 </RelativeLayout>

app/src/main/res/layout/notification_template_big_media_custom.xml

@@ -1,15 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="128dp">
-    <include android:layout_width="@dimen/notification_large_icon_width" android:layout_height="@dimen/notification_large_icon_height" layout="@layout/notification_template_icon_group"/>
-    <include android:layout_width="48dp" android:layout_height="48dp" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" layout="@layout/notification_media_cancel_action"/>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/notification_main_column_container" android:paddingTop="@dimen/notification_main_column_padding_top" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_large_icon_height" android:minHeight="@dimen/notification_large_icon_height" android:layout_toLeftOf="@+id/cancel_action" android:layout_marginStart="@dimen/notification_large_icon_height" android:layout_toStartOf="@+id/cancel_action">
-        <FrameLayout android:id="@+id/notification_main_column" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_content_margin_start" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_weight="1" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="8dp"/>
-        <FrameLayout android:id="@+id/right_side" android:paddingTop="@dimen/notification_right_side_padding_top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:layout_marginEnd="8dp">
-            <DateTimeView android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/time" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-            <Chronometer android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/chronometer" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-            <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media" android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/info" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:singleLine="true"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="128dp">
+
+    <include
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        layout="@layout/notification_template_icon_group" />
+
+    <include
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        layout="@layout/notification_media_cancel_action" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/notification_main_column_container"
+        android:paddingTop="@dimen/notification_main_column_padding_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/notification_large_icon_height"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:layout_toLeftOf="@+id/cancel_action"
+        android:layout_marginStart="@dimen/notification_large_icon_height"
+        android:layout_toStartOf="@+id/cancel_action">
+
+        <FrameLayout
+            android:id="@+id/notification_main_column"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/notification_content_margin_start"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/notification_content_margin_start"
+            android:layout_marginEnd="8dp" />
+
+        <FrameLayout
+            android:id="@+id/right_side"
+            android:paddingTop="@dimen/notification_right_side_padding_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp">
+
+            <DateTimeView
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+                android:layout_gravity="top|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/time"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+
+            <Chronometer
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+                android:layout_gravity="top|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/chronometer"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+
+            <TextView
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+                android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:singleLine="true" />
         </FrameLayout>
     </LinearLayout>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/media_actions" android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_alignParentBottom="true" android:layoutDirection="ltr"/>
-    <ImageView android:id="@+id/action_divider" android:background="?android:attr/dividerHorizontal" android:layout_width="match_parent" android:layout_height="1dp" android:layout_above="@+id/media_actions"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/media_actions"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_alignParentBottom="true"
+        android:layoutDirection="ltr" />
+
+    <ImageView
+        android:id="@+id/action_divider"
+        android:background="?android:attr/dividerHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_above="@+id/media_actions" />
 </RelativeLayout>

app/src/main/res/layout/notification_template_big_media_narrow.xml

@@ -1,8 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="128dp">
-    <ImageView android:id="@+id/icon" android:layout_width="128dp" android:layout_height="128dp" android:scaleType="centerCrop"/>
-    <include android:layout_width="48dp" android:layout_height="48dp" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" layout="@layout/notification_media_cancel_action"/>
-    <include android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="128dp" android:layout_toLeftOf="@+id/cancel_action" android:layout_marginStart="128dp" android:layout_toStartOf="@+id/cancel_action" layout="@layout/notification_template_lines_media"/>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/media_actions" android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_toRightOf="@+id/icon" android:layout_alignParentBottom="true" android:layoutDirection="ltr" android:layout_toEndOf="@+id/icon"/>
-    <ImageView android:id="@+id/action_divider" android:background="?android:attr/dividerHorizontal" android:layout_width="match_parent" android:layout_height="1dp" android:layout_toRightOf="@+id/icon" android:layout_above="@+id/media_actions" android:layout_toEndOf="@+id/icon"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="128dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:scaleType="centerCrop" />
+
+    <include
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        layout="@layout/notification_media_cancel_action" />
+
+    <include
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="128dp"
+        android:layout_toLeftOf="@+id/cancel_action"
+        android:layout_marginStart="128dp"
+        android:layout_toStartOf="@+id/cancel_action"
+        layout="@layout/notification_template_lines_media" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/media_actions"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_toRightOf="@+id/icon"
+        android:layout_alignParentBottom="true"
+        android:layoutDirection="ltr"
+        android:layout_toEndOf="@+id/icon" />
+
+    <ImageView
+        android:id="@+id/action_divider"
+        android:background="?android:attr/dividerHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_toRightOf="@+id/icon"
+        android:layout_above="@+id/media_actions"
+        android:layout_toEndOf="@+id/icon" />
 </RelativeLayout>

app/src/main/res/layout/notification_template_big_media_narrow_custom.xml

@@ -1,15 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="128dp">
-    <ImageView android:id="@+id/icon" android:layout_width="128dp" android:layout_height="128dp" android:scaleType="centerCrop"/>
-    <include android:layout_width="48dp" android:layout_height="48dp" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" layout="@layout/notification_media_cancel_action"/>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/notification_main_column_container" android:paddingTop="@dimen/notification_main_column_padding_top" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="128dp" android:minHeight="@dimen/notification_large_icon_height" android:layout_toLeftOf="@+id/cancel_action" android:layout_marginStart="128dp" android:layout_toStartOf="@+id/cancel_action">
-        <FrameLayout android:id="@+id/notification_main_column" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_media_narrow_margin" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_weight="1" android:layout_marginStart="@dimen/notification_media_narrow_margin" android:layout_marginEnd="8dp"/>
-        <FrameLayout android:id="@+id/right_side" android:paddingTop="@dimen/notification_right_side_padding_top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:layout_marginEnd="8dp">
-            <DateTimeView android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/time" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-            <Chronometer android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/chronometer" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-            <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media" android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/info" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:singleLine="true"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="128dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:scaleType="centerCrop" />
+
+    <include
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        layout="@layout/notification_media_cancel_action" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/notification_main_column_container"
+        android:paddingTop="@dimen/notification_main_column_padding_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="128dp"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:layout_toLeftOf="@+id/cancel_action"
+        android:layout_marginStart="128dp"
+        android:layout_toStartOf="@+id/cancel_action">
+
+        <FrameLayout
+            android:id="@+id/notification_main_column"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/notification_media_narrow_margin"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/notification_media_narrow_margin"
+            android:layout_marginEnd="8dp" />
+
+        <FrameLayout
+            android:id="@+id/right_side"
+            android:paddingTop="@dimen/notification_right_side_padding_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp">
+
+            <DateTimeView
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+                android:layout_gravity="top|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/time"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+
+            <Chronometer
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+                android:layout_gravity="top|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/chronometer"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+
+            <TextView
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+                android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:singleLine="true" />
         </FrameLayout>
     </LinearLayout>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/media_actions" android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_toRightOf="@+id/icon" android:layout_alignParentBottom="true" android:layoutDirection="ltr" android:layout_toEndOf="@+id/icon"/>
-    <ImageView android:id="@+id/action_divider" android:background="?android:attr/dividerHorizontal" android:layout_width="match_parent" android:layout_height="1dp" android:layout_toRightOf="@+id/icon" android:layout_above="@+id/media_actions" android:layout_toEndOf="@+id/icon"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/media_actions"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_toRightOf="@+id/icon"
+        android:layout_alignParentBottom="true"
+        android:layoutDirection="ltr"
+        android:layout_toEndOf="@+id/icon" />
+
+    <ImageView
+        android:id="@+id/action_divider"
+        android:background="?android:attr/dividerHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_toRightOf="@+id/icon"
+        android:layout_above="@+id/media_actions"
+        android:layout_toEndOf="@+id/icon" />
 </RelativeLayout>

app/src/main/res/layout/notification_template_lines_media.xml

@@ -1,13 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingEnd="8dp">
-    <LinearLayout android:orientation="horizontal" android:id="@+id/line1" android:paddingTop="6dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_content_margin_start" android:layout_marginStart="@dimen/notification_content_margin_start">
-        <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Title.Media" android:ellipsize="marquee" android:id="@+id/title" android:fadingEdge="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1"/>
-        <DateTimeView android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="center" android:id="@+id/time" android:paddingLeft="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="0" android:paddingStart="8dp"/>
-        <Chronometer android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="center" android:id="@+id/chronometer" android:paddingLeft="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="0" android:paddingStart="8dp"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:paddingTop="2dp"
+    android:paddingRight="8dp"
+    android:paddingBottom="2dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingEnd="8dp">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/line1"
+        android:paddingTop="6dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/notification_content_margin_start"
+        android:layout_marginStart="@dimen/notification_content_margin_start">
+
+        <TextView
+            android:textAppearance="@style/TextAppearance.Compat.Notification.Title.Media"
+            android:ellipsize="marquee"
+            android:id="@+id/title"
+            android:fadingEdge="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_weight="1" />
+
+        <DateTimeView
+            android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+            android:layout_gravity="center"
+            android:id="@+id/time"
+            android:paddingLeft="8dp"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_weight="0"
+            android:paddingStart="8dp" />
+
+        <Chronometer
+            android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+            android:layout_gravity="center"
+            android:id="@+id/chronometer"
+            android:paddingLeft="8dp"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_weight="0"
+            android:paddingStart="8dp" />
     </LinearLayout>
-    <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Line2.Media" android:ellipsize="marquee" android:id="@+id/text2" android:visibility="gone" android:fadingEdge="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_content_margin_start" android:layout_marginTop="-2dp" android:layout_marginBottom="-2dp" android:singleLine="true" android:layout_marginStart="@dimen/notification_content_margin_start"/>
-    <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/line3" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_content_margin_start" android:layout_marginStart="@dimen/notification_content_margin_start">
-        <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Media" android:ellipsize="marquee" android:layout_gravity="center" android:id="@+id/text" android:fadingEdge="horizontal" android:layout_width="0dp" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1"/>
-        <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media" android:gravity="center" android:layout_gravity="center" android:id="@+id/info" android:paddingLeft="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="0" android:paddingStart="8dp"/>
+
+    <TextView
+        android:textAppearance="@style/TextAppearance.Compat.Notification.Line2.Media"
+        android:ellipsize="marquee"
+        android:id="@+id/text2"
+        android:visibility="gone"
+        android:fadingEdge="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/notification_content_margin_start"
+        android:layout_marginTop="-2dp"
+        android:layout_marginBottom="-2dp"
+        android:singleLine="true"
+        android:layout_marginStart="@dimen/notification_content_margin_start" />
+
+    <LinearLayout
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:id="@+id/line3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/notification_content_margin_start"
+        android:layout_marginStart="@dimen/notification_content_margin_start">
+
+        <TextView
+            android:textAppearance="@style/TextAppearance.Compat.Notification.Media"
+            android:ellipsize="marquee"
+            android:layout_gravity="center"
+            android:id="@+id/text"
+            android:fadingEdge="horizontal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_weight="1" />
+
+        <TextView
+            android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/info"
+            android:paddingLeft="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_weight="0"
+            android:paddingStart="8dp" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/notification_template_media.xml

@@ -1,8 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="64dp">
-    <include android:layout_width="@dimen/notification_large_icon_width" android:layout_height="@dimen/notification_large_icon_height" layout="@layout/notification_template_icon_group"/>
-    <include android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" layout="@layout/notification_template_lines_media"/>
-    <LinearLayout android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:orientation="horizontal" android:id="@+id/media_actions" android:layout_width="wrap_content" android:layout_height="match_parent" android:layoutDirection="ltr"/>
-    <include android:layout_width="48dp" android:layout_height="match_parent" android:layout_marginRight="6dp" android:layout_marginEnd="6dp" layout="@layout/notification_media_cancel_action"/>
-    <ImageView android:id="@+id/end_padder" android:layout_width="6dp" android:layout_height="match_parent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="64dp">
+
+    <include
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        layout="@layout/notification_template_icon_group" />
+
+    <include
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        layout="@layout/notification_template_lines_media" />
+
+    <LinearLayout
+        android:layout_gravity="right|center_vertical|center_horizontal|center|end"
+        android:orientation="horizontal"
+        android:id="@+id/media_actions"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layoutDirection="ltr" />
+
+    <include
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="6dp"
+        android:layout_marginEnd="6dp"
+        layout="@layout/notification_media_cancel_action" />
+
+    <ImageView
+        android:id="@+id/end_padder"
+        android:layout_width="6dp"
+        android:layout_height="match_parent" />
 </LinearLayout>

app/src/main/res/layout/notification_template_media_custom.xml

@@ -1,15 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="64dp">
-    <include android:layout_width="@dimen/notification_large_icon_width" android:layout_height="@dimen/notification_large_icon_height" layout="@layout/notification_template_icon_group"/>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/notification_main_column_container" android:paddingTop="@dimen/notification_main_column_padding_top" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="@dimen/notification_large_icon_height" android:layout_weight="1" android:layout_toLeftOf="@+id/cancel_action" android:layout_toStartOf="@+id/cancel_action">
-        <FrameLayout android:id="@+id/notification_main_column" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/notification_content_margin_start" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_weight="1" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="8dp"/>
-        <FrameLayout android:id="@+id/right_side" android:paddingTop="@dimen/notification_right_side_padding_top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:layout_marginEnd="8dp">
-            <DateTimeView android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/time" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-            <Chronometer android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/chronometer" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
-            <TextView android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media" android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/info" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:singleLine="true"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="64dp">
+
+    <include
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        layout="@layout/notification_template_icon_group" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/notification_main_column_container"
+        android:paddingTop="@dimen/notification_main_column_padding_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:layout_weight="1"
+        android:layout_toLeftOf="@+id/cancel_action"
+        android:layout_toStartOf="@+id/cancel_action">
+
+        <FrameLayout
+            android:id="@+id/notification_main_column"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/notification_content_margin_start"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/notification_content_margin_start"
+            android:layout_marginEnd="8dp" />
+
+        <FrameLayout
+            android:id="@+id/right_side"
+            android:paddingTop="@dimen/notification_right_side_padding_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp">
+
+            <DateTimeView
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+                android:layout_gravity="top|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/time"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+
+            <Chronometer
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Time.Media"
+                android:layout_gravity="top|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/chronometer"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+
+            <TextView
+                android:textAppearance="@style/TextAppearance.Compat.Notification.Info.Media"
+                android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end"
+                android:id="@+id/info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:singleLine="true" />
         </FrameLayout>
     </LinearLayout>
-    <LinearLayout android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:orientation="horizontal" android:id="@+id/media_actions" android:layout_width="wrap_content" android:layout_height="match_parent" android:layoutDirection="ltr"/>
-    <include android:layout_width="48dp" android:layout_height="match_parent" android:layout_marginRight="6dp" android:layout_marginEnd="6dp" layout="@layout/notification_media_cancel_action"/>
-    <ImageView android:id="@+id/end_padder" android:layout_width="6dp" android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:layout_gravity="right|center_vertical|center_horizontal|center|end"
+        android:orientation="horizontal"
+        android:id="@+id/media_actions"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layoutDirection="ltr" />
+
+    <include
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="6dp"
+        android:layout_marginEnd="6dp"
+        layout="@layout/notification_media_cancel_action" />
+
+    <ImageView
+        android:id="@+id/end_padder"
+        android:layout_width="6dp"
+        android:layout_height="match_parent" />
 </LinearLayout>

app/src/main/res/layout/notification_template_part_chronometer.xml

@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Chronometer xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/TextAppearance.Compat.Notification.Time" android:id="@+id/chronometer" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
+<Chronometer xmlns:android="http://schemas.android.com/apk/res/android"
+    android:textAppearance="@style/TextAppearance.Compat.Notification.Time"
+    android:id="@+id/chronometer"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:singleLine="true" />

app/src/main/res/layout/notification_template_part_time.xml

@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DateTimeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/TextAppearance.Compat.Notification.Time" android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true"/>
+<DateTimeView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:textAppearance="@style/TextAppearance.Compat.Notification.Time"
+    android:id="@+id/time"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:singleLine="true" />

app/src/main/res/layout/page_range_layout.xml

@@ -1,28 +1,153 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:fillViewport="true">
-        <LinearLayout android:orientation="vertical" android:paddingLeft="10dp" android:paddingRight="10dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <FrameLayout android:background="@drawable/listitem_bg" android:layout_width="match_parent" android:layout_height="55dp">
-                <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left|center_vertical|center_horizontal|center" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:text="@string/print_all_page"/>
-                <epson.print.widgets.SwichClickable android:gravity="center" android:layout_gravity="right|center_vertical|center_horizontal|center" android:id="@+id/print_all_toggle_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="10dp" android:textOn="@string/EPS_APF_RDE_CORRECT" android:textOff="@string/EPS_APF_RDE_NOTHING"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <FrameLayout
+                android:background="@drawable/listitem_bg"
+                android:layout_width="match_parent"
+                android:layout_height="55dp">
+
+                <TextView
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/print_all_page" />
+
+                <epson.print.widgets.SwichClickable
+                    android:gravity="center"
+                    android:layout_gravity="right|center_vertical|center_horizontal|center"
+                    android:id="@+id/print_all_toggle_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:textOn="@string/EPS_APF_RDE_CORRECT"
+                    android:textOff="@string/EPS_APF_RDE_NOTHING" />
             </FrameLayout>
-            <LinearLayout android:orientation="vertical" android:background="@drawable/listitem_bg" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <FrameLayout android:layout_width="match_parent" android:layout_height="40dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:text="@string/start_page"/>
-                    <LinearLayout android:layout_gravity="right" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="match_parent">
-                        <TextView android:textSize="18sp" android:textColor="@android:color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/start_page_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="10dp" android:text="0"/>
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/start_page_minus_button" android:text="-" style="@style/PlusMinusButton"/>
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/start_page_plus_button" android:layout_marginRight="10dp" android:text="+" style="@style/PlusMinusButton"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:background="@drawable/listitem_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/start_page" />
+
+                    <LinearLayout
+                        android:layout_gravity="right"
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <TextView
+                            android:textSize="18sp"
+                            android:textColor="@android:color/black"
+                            android:gravity="right|center_vertical|center_horizontal|center"
+                            android:layout_gravity="right"
+                            android:id="@+id/start_page_value"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginRight="10dp"
+                            android:text="0" />
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/start_page_minus_button"
+                            android:text="-"
+                            style="@style/PlusMinusButton" />
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/start_page_plus_button"
+                            android:layout_marginRight="10dp"
+                            android:text="+"
+                            style="@style/PlusMinusButton" />
                     </LinearLayout>
                 </FrameLayout>
-                <View android:background="@color/light" android:layout_width="match_parent" android:layout_height="1dp"/>
-                <FrameLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="40dp">
-                    <TextView android:textSize="18sp" android:textStyle="bold" android:textColor="@android:color/black" android:gravity="center_vertical" android:layout_gravity="left" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:text="@string/end_page"/>
-                    <LinearLayout android:layout_gravity="right" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="match_parent">
-                        <TextView android:textSize="18sp" android:textColor="@android:color/black" android:gravity="right|center_vertical|center_horizontal|center" android:layout_gravity="right" android:id="@+id/end_page_value" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginRight="10dp" android:text="0"/>
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/end_page_minus_button" android:text="-" style="@style/PlusMinusButton"/>
-                        <Button android:layout_gravity="center_vertical" android:id="@+id/end_page_plus_button" android:layout_marginRight="10dp" android:text="+" style="@style/PlusMinusButton"/>
+
+                <View
+                    android:background="@color/light"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <FrameLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp">
+
+                    <TextView
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/black"
+                        android:gravity="center_vertical"
+                        android:layout_gravity="left"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/end_page" />
+
+                    <LinearLayout
+                        android:layout_gravity="right"
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <TextView
+                            android:textSize="18sp"
+                            android:textColor="@android:color/black"
+                            android:gravity="right|center_vertical|center_horizontal|center"
+                            android:layout_gravity="right"
+                            android:id="@+id/end_page_value"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginRight="10dp"
+                            android:text="0" />
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/end_page_minus_button"
+                            android:text="-"
+                            style="@style/PlusMinusButton" />
+
+                        <Button
+                            android:layout_gravity="center_vertical"
+                            android:id="@+id/end_page_plus_button"
+                            android:layout_marginRight="10dp"
+                            android:text="+"
+                            style="@style/PlusMinusButton" />
                     </LinearLayout>
                 </FrameLayout>
             </LinearLayout>

app/src/main/res/layout/paper_source_setting.xml

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <TextView android:gravity="center" android:id="@+id/empty" android:visibility="visible" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="2dp"/>
-    <include layout="@layout/mylistview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <TextView
+        android:gravity="center"
+        android:id="@+id/empty"
+        android:visibility="visible"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp" />
+
+    <include layout="@layout/mylistview" />
 </LinearLayout>

app/src/main/res/layout/pdf_file_password.xml

@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <EditText android:id="@+id/etPassword" android:layout_width="match_parent" android:layout_height="62dp" android:text="" android:hint="@string/str_edit_password" android:password="true" android:layout_weight="10" android:inputType="text">
-        <requestFocus/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <EditText
+        android:id="@+id/etPassword"
+        android:layout_width="match_parent"
+        android:layout_height="62dp"
+        android:text=""
+        android:hint="@string/str_edit_password"
+        android:password="true"
+        android:layout_weight="10"
+        android:inputType="text">
+
+        <requestFocus />
     </EditText>
 </LinearLayout>

app/src/main/res/layout/photo_preview.xml

@@ -1,32 +1,153 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:focusableInTouchMode="false" android:layout_width="match_parent" android:layout_height="match_parent">
-    <include layout="@layout/navigationbar"/>
-    <FrameLayout android:id="@+id/frameLayout1" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/linearLayout3" android:layout_below="@+id/navigation_bar">
-        <epson.print.phlayout.PhotoPreview android:id="@+id/previewImageView" android:layout_width="match_parent" android:layout_height="match_parent"/>
-        <LinearLayout android:gravity="right|center_vertical|center_horizontal|center" android:id="@+id/linear_layout_papersize" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <ImageView android:id="@+id/icon_papermissmatch" android:background="@drawable/ic_exclamation" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp"/>
-            <TextView android:textSize="15sp" android:textStyle="bold" android:textColor="@color/epson_blue" android:id="@+id/btn_paper_size" android:background="@color/all_white" android:paddingLeft="1dp" android:paddingTop="0dp" android:paddingRight="1dp" android:paddingBottom="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1dp" android:layout_marginRight="1dp" android:layout_marginBottom="1dp" android:text="@string/size"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:focusableInTouchMode="false"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/navigationbar" />
+
+    <FrameLayout
+        android:id="@+id/frameLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/linearLayout3"
+        android:layout_below="@+id/navigation_bar">
+
+        <epson.print.phlayout.PhotoPreview
+            android:id="@+id/previewImageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:gravity="right|center_vertical|center_horizontal|center"
+            android:id="@+id/linear_layout_papersize"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/icon_papermissmatch"
+                android:background="@drawable/ic_exclamation"
+                android:visibility="gone"
+                android:layout_width="24dp"
+                android:layout_height="24dp" />
+
+            <TextView
+                android:textSize="15sp"
+                android:textStyle="bold"
+                android:textColor="@color/epson_blue"
+                android:id="@+id/btn_paper_size"
+                android:background="@color/all_white"
+                android:paddingLeft="1dp"
+                android:paddingTop="0dp"
+                android:paddingRight="1dp"
+                android:paddingBottom="0dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginRight="1dp"
+                android:layout_marginBottom="1dp"
+                android:text="@string/size" />
         </LinearLayout>
-        <LinearLayout android:gravity="bottom" android:id="@+id/linear_layout_count" android:layout_width="match_parent" android:layout_height="match_parent">
-            <LinearLayout android:gravity="bottom" android:id="@+id/linearLayout" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <LinearLayout android:gravity="left|center_vertical|center_horizontal|center" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1">
-                    <TextView android:textSize="15sp" android:textStyle="bold" android:textColor="@color/all_black" android:id="@+id/btn_photo_count" android:paddingLeft="5dp" android:paddingRight="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/page"/>
+
+        <LinearLayout
+            android:gravity="bottom"
+            android:id="@+id/linear_layout_count"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:gravity="bottom"
+                android:id="@+id/linearLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:gravity="left|center_vertical|center_horizontal|center"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <TextView
+                        android:textSize="15sp"
+                        android:textStyle="bold"
+                        android:textColor="@color/all_black"
+                        android:id="@+id/btn_photo_count"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="@string/page" />
                 </LinearLayout>
-                <ImageView android:id="@+id/epsonColorImageView" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/eclogo_basic_black"/>
+
+                <ImageView
+                    android:id="@+id/epsonColorImageView"
+                    android:visibility="visible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/eclogo_basic_black" />
             </LinearLayout>
         </LinearLayout>
     </FrameLayout>
-    <LinearLayout android:orientation="horizontal" android:id="@+id/linearLayout3" android:background="@color/background_gallary" android:layout_width="match_parent" android:layout_height="70dp" android:layout_above="@+id/ln_toolbar">
-        <Gallery android:id="@+id/gallery" android:layout_width="match_parent" android:layout_height="wrap_content" android:spacing="1dp" android:layout_weight="1" android:unselectedAlpha="0.6"/>
-        <LinearLayout android:orientation="horizontal" android:background="@color/background_gallary_add" android:layout_width="wrap_content" android:layout_height="match_parent">
-            <ImageButton android:layout_gravity="center_vertical" android:id="@+id/btn_add_photo" android:background="@color/all_transparent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:src="@drawable/plus"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/linearLayout3"
+        android:background="@color/background_gallary"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_above="@+id/ln_toolbar">
+
+        <Gallery
+            android:id="@+id/gallery"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:spacing="1dp"
+            android:layout_weight="1"
+            android:unselectedAlpha="0.6" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:background="@color/background_gallary_add"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <ImageButton
+                android:layout_gravity="center_vertical"
+                android:id="@+id/btn_add_photo"
+                android:background="@color/all_transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:src="@drawable/plus" />
         </LinearLayout>
     </LinearLayout>
-    <RelativeLayout android:id="@+id/ln_toolbar" style="@style/FunctionBar">
-        <LinearLayout android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="match_parent">
-            <Button android:id="@+id/btn_deselect" android:text="@string/str_unselect" style="@style/FunctionButton.Normal"/>
-            <Button android:id="@+id/bt_rotate" android:text="@string/rotate_button" style="@style/FunctionButton.Normal"/>
+
+    <RelativeLayout
+        android:id="@+id/ln_toolbar"
+        style="@style/FunctionBar">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <Button
+                android:id="@+id/btn_deselect"
+                android:text="@string/str_unselect"
+                style="@style/FunctionButton.Normal" />
+
+            <Button
+                android:id="@+id/bt_rotate"
+                android:text="@string/rotate_button"
+                style="@style/FunctionButton.Normal" />
         </LinearLayout>
-        <Button android:id="@+id/btn_print" android:text="@string/str_print" android:layout_alignParentRight="true" style="@style/FunctionButton.Execute"/>
+
+        <Button
+            android:id="@+id/btn_print"
+            android:text="@string/str_print"
+            android:layout_alignParentRight="true"
+            style="@style/FunctionButton.Execute" />
     </RelativeLayout>
 </RelativeLayout>