add file

app/src/main/java/com/epson/cameracopy/device/AptSensorAdapter.java

@@ -1,5 +1,6 @@
 package com.epson.cameracopy.device;
 
+import android.app.Service;
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
@@ -30,7 +31,7 @@ public class AptSensorAdapter implements SensorEventListener {
     }
 
     public static boolean hasAptSensor(Context context) {
-        return hasAptSensor((SensorManager) context.getSystemService("sensor"));
+        return hasAptSensor((SensorManager) context.getSystemService(Service.SENSOR_SERVICE));
     }
 
     public void setSensorManager(SensorManager sensorManager) {

app/src/main/java/com/epson/cameracopy/p006ui/AreaComparator.java → app/src/main/java/com/epson/cameracopy/ui/AreaComparator.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.graphics.Point;
 import java.util.Comparator;

app/src/main/java/com/epson/cameracopy/p006ui/CameraCopyProgressParams.java → app/src/main/java/com/epson/cameracopy/ui/CameraCopyProgressParams.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.Context;
 import android.os.RemoteException;

app/src/main/java/com/epson/cameracopy/p006ui/CameraFileAdapter.java → app/src/main/java/com/epson/cameracopy/ui/CameraFileAdapter.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.Context;
 import com.epson.cameracopy.device.CameraFile;

app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewActivity.java → app/src/main/java/com/epson/cameracopy/ui/CameraPreviewActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java → app/src/main/java/com/epson/cameracopy/ui/CameraPreviewFragment.java

@@ -1,5 +1,6 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
+import android.app.Service;
 import android.content.Intent;
 import android.hardware.Camera;
 import android.hardware.SensorManager;
@@ -22,6 +23,7 @@ import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.device.OpenCvCameraView;
 import com.epson.cameracopy.device.RectangleDetector;
 
+import epson.print.R;
 import epson.print.imgsel.CameraCopyImageSelectActivity;
 import java.util.Date;
 import java.util.Iterator;
@@ -107,7 +109,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             }
         }
         mOpenCvCameraView.setVisibility(0);
-        mDisplayRotation = ((WindowManager) getActivity().getSystemService("window")).getDefaultDisplay().getRotation();
+        mDisplayRotation = ((WindowManager) getActivity().getSystemService(Service.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
         mSensorEventListener.setDisplayRotation(mDisplayRotation);
         mSensorEventListener.setSensorManager((SensorManager) getActivity().getSystemService("sensor"));
         mSensorEventListener.setReferenceAccelaration(REFERENCE_ACCELARATION);
@@ -496,7 +498,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
 
     public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
         if (!mDisableSettingsButton) {
-            menuInflater.inflate(R.C2138menu.camera_menu, menu);
+            menuInflater.inflate(R.menu.camera_menu, menu);
         }
         super.onCreateOptionsMenu(menu, menuInflater);
     }

app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java → app/src/main/java/com/epson/cameracopy/ui/CameraPreviewOptionActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.Intent;
 import android.graphics.Point;
@@ -15,7 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 import com.epson.cameracopy.device.CameraPreviewControl;
-import com.epson.cameracopy.p006ui.PictureResolutionDialogFragment;
+
 import epson.print.ActivityIACommon;
 
 import java.io.File;
@@ -164,7 +164,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
         }
 
         public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
-            menuInflater.inflate(R.C2138menu.menu_done, menu);
+            menuInflater.inflate(R.menu.menu_done, menu);
             super.onCreateOptionsMenu(menu, menuInflater);
         }
 

app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java → app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -94,7 +94,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         public boolean handleMessage(android.os.Message r9) {
             /*
                 r8 = this;
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r0 = r0.mCanceled
                 r1 = 5
                 r2 = 1
@@ -105,15 +105,15 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (r0 == r9) goto L_0x0011
                 return r2
             L_0x0011:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.os.Handler r9 = r9.mHandler
                 r9.sendEmptyMessage(r1)
                 return r2
             L_0x0019:
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.content.Context r0 = r0.context
                 java.lang.String r3 = "printer"
-                com.epson.cameracopy.ui.CameraPrintProgress r4 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r4 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r4 = r4.printerIp
                 com.epson.mobilephone.common.wifidirect.WiFiDirectManager.disconnect(r0, r3, r4)
             L_0x002a:
@@ -139,7 +139,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             L_0x0034:
                 goto L_0x0573
             L_0x0036:
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean unused = r0.mError = r2
                 int r0 = r9.arg1
                 r1 = -1100(0xfffffffffffffbb4, float:NaN)
@@ -167,14 +167,14 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                     default: goto L_0x0057;
                 }
             L_0x0057:
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r0 = r0.getString(r6)
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r6 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r6 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r5 = r6.getString(r5)
                 r1.append(r5)
-                com.epson.cameracopy.ui.CameraPrintProgress r5 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r5 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r4 = r5.getString(r4)
                 r1.append(r4)
                 java.lang.String r4 = "0X"
@@ -183,58 +183,58 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 java.lang.String r9 = java.lang.Integer.toHexString(r9)
                 java.lang.String r9 = r9.toUpperCase()
                 r1.append(r9)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r9 = r9.getString(r3)
                 r1.append(r9)
                 java.lang.String r9 = r1.toString()
                 goto L_0x0185
             L_0x0095:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r0 = 2131624025(0x7f0e0059, float:1.8875218E38)
                 java.lang.String r0 = r9.getString(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624024(0x7f0e0058, float:1.8875216E38)
                 java.lang.String r9 = r9.getString(r1)
                 goto L_0x0185
             L_0x00a9:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r0 = 2131624028(0x7f0e005c, float:1.8875224E38)
                 java.lang.String r0 = r9.getString(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624027(0x7f0e005b, float:1.8875222E38)
                 java.lang.String r9 = r9.getString(r1)
                 goto L_0x0185
             L_0x00bd:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r0 = 2131624023(0x7f0e0057, float:1.8875214E38)
                 java.lang.String r0 = r9.getString(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624022(0x7f0e0056, float:1.8875212E38)
                 java.lang.String r9 = r9.getString(r1)
                 goto L_0x0185
             L_0x00d1:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r0 = 2131624016(0x7f0e0050, float:1.88752E38)
                 java.lang.String r0 = r9.getString(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624012(0x7f0e004c, float:1.8875192E38)
                 java.lang.String r9 = r9.getString(r1)
                 goto L_0x0185
             L_0x00e5:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r0 = 2131624787(0x7f0e0353, float:1.8876764E38)
                 java.lang.String r0 = r9.getString(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624786(0x7f0e0352, float:1.8876762E38)
                 java.lang.String r9 = r9.getString(r1)
                 goto L_0x0185
             L_0x00f9:
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624009(0x7f0e0049, float:1.8875186E38)
                 java.lang.String r0 = r0.getString(r1)
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r4 = 2131624007(0x7f0e0047, float:1.8875182E38)
                 java.lang.String r3 = r3.getString(r4)
                 r1.append(r3)
@@ -244,21 +244,21 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 java.lang.String r9 = java.lang.Integer.toHexString(r9)
                 java.lang.String r9 = r9.toUpperCase()
                 r1.append(r9)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r3 = 2131624008(0x7f0e0048, float:1.8875184E38)
                 java.lang.String r9 = r9.getString(r3)
                 r1.append(r9)
                 java.lang.String r9 = r1.toString()
                 goto L_0x0185
             L_0x0136:
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r0 = r0.getString(r6)
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r6 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r6 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r5 = r6.getString(r5)
                 r1.append(r5)
-                com.epson.cameracopy.ui.CameraPrintProgress r5 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r5 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r4 = r5.getString(r4)
                 r1.append(r4)
                 java.lang.String r4 = "0X"
@@ -267,49 +267,49 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 java.lang.String r9 = java.lang.Integer.toHexString(r9)
                 java.lang.String r9 = r9.toUpperCase()
                 r1.append(r9)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r9 = r9.getString(r3)
                 r1.append(r9)
                 java.lang.String r9 = r1.toString()
                 goto L_0x0185
             L_0x0173:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r0 = 2131624032(0x7f0e0060, float:1.8875232E38)
                 java.lang.String r0 = r9.getString(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131624031(0x7f0e005f, float:1.887523E38)
                 java.lang.String r9 = r9.getString(r1)
             L_0x0185:
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1.showErrorDialog(r0, r9)
                 goto L_0x0573
             L_0x018c:
                 android.app.AlertDialog$Builder r9 = new android.app.AlertDialog$Builder
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.content.Context r0 = r0.context
                 r9.<init>(r0)
                 android.app.AlertDialog$Builder r9 = r9.setCancelable(r7)
                 java.lang.StringBuilder r0 = new java.lang.StringBuilder
                 r0.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r3 = 2131624796(0x7f0e035c, float:1.8876782E38)
                 java.lang.String r1 = r1.getString(r3)
                 r0.append(r1)
                 java.lang.String r1 = "\n"
                 r0.append(r1)
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r3 = 2131624797(0x7f0e035d, float:1.8876784E38)
                 java.lang.String r1 = r1.getString(r3)
                 r0.append(r1)
                 java.lang.String r1 = "\n\n"
                 r0.append(r1)
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r3 = 2131624798(0x7f0e035e, float:1.8876786E38)
                 java.lang.String r1 = r1.getString(r3)
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
                 android.app.AlertDialog$Builder r9 = r9.setMessage(r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r1 = 2131625202(0x7f0e04f2, float:1.8877605E38)
                 java.lang.String r0 = r0.getString(r1)
                 com.epson.cameracopy.ui.CameraPrintProgress$4$1 r1 = new com.epson.cameracopy.ui.CameraPrintProgress$4$1
@@ -318,38 +318,38 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r9.show()
                 goto L_0x0573
             L_0x01ed:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int unused = r9.curSheet = r2
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int unused = r9.curCopy = r2
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.content.Context r9 = r9.context
                 java.lang.String r0 = "printer"
                 boolean r9 = com.epson.mobilephone.common.wifidirect.WiFiDirectManager.isNeedConnect(r9, r0)
                 if (r9 != 0) goto L_0x0206
                 goto L_0x0212
             L_0x0206:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r0 = "printer"
                 boolean r9 = com.epson.mobilephone.common.wifidirect.WiFiDirectManager.reconnect(r9, r0, r2)
                 if (r9 == 0) goto L_0x0212
                 goto L_0x0573
             L_0x0212:
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService
                 if (r9 == 0) goto L_0x0274
                 java.lang.String r9 = "Epson"
                 java.lang.String r0 = "begin probe printer before printing"
                 epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)     // Catch:{ RemoteException -> 0x026e }
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
                 epson.print.MyPrinter r9 = epson.print.MyPrinter.getCurPrinter(r9)     // Catch:{ RemoteException -> 0x026e }
                 java.lang.String r0 = r9.getPrinterId()     // Catch:{ RemoteException -> 0x026e }
                 java.lang.String r1 = r9.getIp()     // Catch:{ RemoteException -> 0x026e }
                 if (r0 == 0) goto L_0x0243
                 int r5 = r9.getLocation()     // Catch:{ RemoteException -> 0x026e }
                 if (r5 != r2) goto L_0x0243
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
                 boolean unused = r9.bSearching = r2     // Catch:{ RemoteException -> 0x026e }
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x026e }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x026e }
                 r9.searchPrinters(r0, r1, r2)     // Catch:{ RemoteException -> 0x026e }
                 goto L_0x0573
             L_0x0243:
@@ -357,18 +357,18 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 int r9 = r9.getLocation()     // Catch:{ RemoteException -> 0x026e }
                 r5 = 3
                 if (r9 != r5) goto L_0x025a
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
                 boolean unused = r9.bSearching = r2     // Catch:{ RemoteException -> 0x026e }
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x026e }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x026e }
                 r9.searchPrinters(r0, r1, r4)     // Catch:{ RemoteException -> 0x026e }
                 goto L_0x0573
             L_0x025a:
-                com.epson.cameracopy.p006ui.CameraPrintProgress.isContinue = r7     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress.isContinue = r7     // Catch:{ RemoteException -> 0x026e }
                 r9 = -1351(0xfffffffffffffab9, float:NaN)
-                com.epson.cameracopy.p006ui.CameraPrintProgress.curError = r9     // Catch:{ RemoteException -> 0x026e }
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress.curError = r9     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
                 boolean unused = r9.mError = r2     // Catch:{ RemoteException -> 0x026e }
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
                 android.os.Handler r9 = r9.mHandler     // Catch:{ RemoteException -> 0x026e }
                 r9.sendEmptyMessage(r3)     // Catch:{ RemoteException -> 0x026e }
                 goto L_0x0573
@@ -377,7 +377,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r9.printStackTrace()
                 goto L_0x0573
             L_0x0274:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.os.Handler r9 = r9.mHandler
                 r0 = 10
                 r9.sendEmptyMessageDelayed(r0, r5)
@@ -388,32 +388,32 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r0.<init>()
                 java.lang.String r4 = "message FINISH : mError => "
                 r0.append(r4)
-                com.epson.cameracopy.ui.CameraPrintProgress r4 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r4 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r4 = r4.mError
                 r0.append(r4)
                 java.lang.String r4 = " mCanceled =>"
                 r0.append(r4)
-                com.epson.cameracopy.ui.CameraPrintProgress r4 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r4 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r4 = r4.mCanceled
                 r0.append(r4)
                 java.lang.String r0 = r0.toString()
                 epson.print.Util.EPLog.m305d(r9, r0)
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService
                 if (r9 == 0) goto L_0x034d
-                java.lang.Object r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mLock     // Catch:{ RemoteException -> 0x031f }
+                java.lang.Object r9 = com.epson.cameracopy.ui.CameraPrintProgress.mLock     // Catch:{ RemoteException -> 0x031f }
                 monitor-enter(r9)     // Catch:{ RemoteException -> 0x031f }
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ all -> 0x031c }
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ all -> 0x031c }
                 boolean r0 = r0.bSearchingPrinter     // Catch:{ all -> 0x031c }
                 if (r0 == 0) goto L_0x02da
-                boolean r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.bRestartactivity     // Catch:{ all -> 0x031c }
+                boolean r0 = com.epson.cameracopy.ui.CameraPrintProgress.bRestartactivity     // Catch:{ all -> 0x031c }
                 if (r0 != 0) goto L_0x02da
-                epson.print.service.IEpsonService r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ all -> 0x031c }
+                epson.print.service.IEpsonService r0 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ all -> 0x031c }
                 boolean r0 = r0.isSearchingPrinter()     // Catch:{ all -> 0x031c }
                 if (r0 == 0) goto L_0x02da
                 java.lang.String r0 = "PrintProgress"
                 java.lang.String r4 = "message FINISH: mEpsonService.cancelSearchPrinter()"
                 epson.print.Util.EPLog.m307e((java.lang.String) r0, (java.lang.String) r4)     // Catch:{ all -> 0x031c }
-                epson.print.service.IEpsonService r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ all -> 0x031c }
+                epson.print.service.IEpsonService r0 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ all -> 0x031c }
                 r0.cancelSearchPrinter()     // Catch:{ all -> 0x031c }
                 r0 = 1
                 goto L_0x02db
@@ -421,28 +421,28 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r0 = 0
             L_0x02db:
                 monitor-exit(r9)     // Catch:{ all -> 0x031c }
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
                 if (r9 == 0) goto L_0x0301
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
                 boolean r9 = r9.isPrinting()     // Catch:{ RemoteException -> 0x031f }
                 if (r9 == 0) goto L_0x0301
-                boolean r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.bRestartactivity     // Catch:{ RemoteException -> 0x031f }
+                boolean r9 = com.epson.cameracopy.ui.CameraPrintProgress.bRestartactivity     // Catch:{ RemoteException -> 0x031f }
                 if (r9 != 0) goto L_0x0301
                 java.lang.String r9 = "PrintProgress"
                 java.lang.String r0 = "message FINISH: mEpsonService.confirmCancel(true) call"
                 epson.print.Util.EPLog.m305d(r9, r0)     // Catch:{ RemoteException -> 0x031f }
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
                 r9.confirmCancel(r2)     // Catch:{ RemoteException -> 0x031f }
                 r0 = 1
             L_0x0301:
                 if (r0 == 0) goto L_0x0323
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x031f }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x031f }
                 boolean r9 = r9.mWaitEpsonServiceForFinish     // Catch:{ RemoteException -> 0x031f }
                 if (r9 == 0) goto L_0x0323
                 java.lang.String r9 = "PrintProgress"
                 java.lang.String r0 = "on message FINISH: sendEmptyMessageDelayed(FINISH...)"
                 epson.print.Util.EPLog.m305d(r9, r0)     // Catch:{ RemoteException -> 0x031f }
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x031f }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x031f }
                 android.os.Handler r9 = r9.mHandler     // Catch:{ RemoteException -> 0x031f }
                 r4 = 500(0x1f4, double:2.47E-321)
                 r9.sendEmptyMessageDelayed(r1, r4)     // Catch:{ RemoteException -> 0x031f }
@@ -455,47 +455,47 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r9 = move-exception
                 r9.printStackTrace()
             L_0x0323:
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x0349 }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x0349 }
                 if (r9 == 0) goto L_0x034d
                 java.lang.String r9 = "PrintProgress"
                 java.lang.String r0 = "message FINISH: mEpsonService.unregisterCallback() call"
                 epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)     // Catch:{ RemoteException -> 0x0349 }
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x0349 }
-                epson.print.service.IEpsonServiceCallback r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.mCallback     // Catch:{ RemoteException -> 0x0349 }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x0349 }
+                epson.print.service.IEpsonServiceCallback r0 = com.epson.cameracopy.ui.CameraPrintProgress.mCallback     // Catch:{ RemoteException -> 0x0349 }
                 r9.unregisterCallback(r0)     // Catch:{ RemoteException -> 0x0349 }
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x0349 }
-                android.content.ServiceConnection r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonConnection     // Catch:{ RemoteException -> 0x0349 }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x0349 }
+                android.content.ServiceConnection r0 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonConnection     // Catch:{ RemoteException -> 0x0349 }
                 r9.unbindService(r0)     // Catch:{ RemoteException -> 0x0349 }
                 r9 = 0
-                epson.print.service.IEpsonService unused = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService = r9     // Catch:{ RemoteException -> 0x0349 }
+                epson.print.service.IEpsonService unused = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService = r9     // Catch:{ RemoteException -> 0x0349 }
                 goto L_0x034d
             L_0x0349:
                 r9 = move-exception
                 r9.printStackTrace()
             L_0x034d:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r9 = r9.mCanceled
                 if (r9 == 0) goto L_0x0355
                 r3 = 0
                 goto L_0x035f
             L_0x0355:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r9 = r9.mError
                 if (r9 == 0) goto L_0x035f
                 r3 = 1000(0x3e8, float:1.401E-42)
             L_0x035f:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.app.Activity r9 = r9.getParent()
                 if (r9 != 0) goto L_0x036d
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r9.setResult(r3)
                 goto L_0x0376
             L_0x036d:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.app.Activity r9 = r9.getParent()
                 r9.setResult(r3)
             L_0x0376:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean unused = r9.bSearching = r7
                 java.lang.String r9 = "PrintProgress"
                 java.lang.StringBuilder r0 = new java.lang.StringBuilder
@@ -505,22 +505,22 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r0.append(r3)
                 java.lang.String r0 = r0.toString()
                 epson.print.Util.EPLog.m305d(r9, r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.content.Context r9 = r9.context
                 java.lang.String r0 = "printer"
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r1 = r1.printerIp
                 com.epson.mobilephone.common.wifidirect.WiFiDirectManager.disconnect(r9, r0, r1)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r9.sendPrintLog()
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r9.finish()
                 goto L_0x0573
             L_0x03ae:
                 java.lang.String r9 = "Epson"
                 java.lang.String r0 = "NOTIFY ERROR"
                 epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r9 = r9.isDialogOpen
                 if (r9 != 0) goto L_0x03d6
                 java.lang.String r9 = "Epson"
@@ -528,7 +528,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r0.<init>()
                 java.lang.String r1 = "Show Error code:"
                 r0.append(r1)
-                int r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.curError
+                int r1 = com.epson.cameracopy.ui.CameraPrintProgress.curError
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
                 epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)
@@ -539,29 +539,29 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r0.<init>()
                 java.lang.String r1 = "Remove and show Error code:"
                 r0.append(r1)
-                int r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.curError
+                int r1 = com.epson.cameracopy.ui.CameraPrintProgress.curError
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
                 epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r9.removeDialog(r7)
             L_0x03f3:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean unused = r9.isDialogOpen = r2
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r9.showDialog(r7)
                 goto L_0x0573
             L_0x03ff:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean unused = r9.mError = r7
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService
                 if (r9 == 0) goto L_0x0426
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ Exception -> 0x0420 }
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ Exception -> 0x0420 }
                 boolean unused = r9.bSearching = r7     // Catch:{ Exception -> 0x0420 }
-                epson.print.service.IEpsonService r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mEpsonService     // Catch:{ Exception -> 0x0420 }
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this     // Catch:{ Exception -> 0x0420 }
+                epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ Exception -> 0x0420 }
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ Exception -> 0x0420 }
                 java.util.ArrayList r0 = r0.mImageAndLayoutList     // Catch:{ Exception -> 0x0420 }
-                boolean r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.isBkRetry     // Catch:{ Exception -> 0x0420 }
+                boolean r1 = com.epson.cameracopy.ui.CameraPrintProgress.isBkRetry     // Catch:{ Exception -> 0x0420 }
                 r9.printWithImagesAndLayouts(r0, r1)     // Catch:{ Exception -> 0x0420 }
                 goto L_0x0573
             L_0x0420:
@@ -572,20 +572,20 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 java.lang.String r9 = "Epson"
                 java.lang.String r0 = "Service or resource file not ready, please wait..."
                 epson.print.Util.EPLog.m313i(r9, r0)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.widget.TextView r9 = r9.mPercent
                 java.lang.StringBuilder r0 = new java.lang.StringBuilder
                 r0.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r1 = r1.percentString
                 r0.append(r1)
                 java.lang.String r1 = "         0%"
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
                 r9.setText(r0)
-                android.widget.ProgressBar r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mProgressPercent
+                android.widget.ProgressBar r9 = com.epson.cameracopy.ui.CameraPrintProgress.mProgressPercent
                 r9.setProgress(r7)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.os.Handler r9 = r9.mHandler
                 r9.sendEmptyMessageDelayed(r4, r5)
                 goto L_0x0573
@@ -598,100 +598,100 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r9 = 100
             L_0x0469:
                 if (r9 > 0) goto L_0x0548
-                android.widget.ProgressBar r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mProgressPercent
+                android.widget.ProgressBar r9 = com.epson.cameracopy.ui.CameraPrintProgress.mProgressPercent
                 r9.setProgress(r7)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.widget.TextView r9 = r9.mPercent
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r3 = r3.percentString
                 r1.append(r3)
                 java.lang.String r3 = "         0%"
                 r1.append(r3)
                 java.lang.String r1 = r1.toString()
                 r9.setText(r1)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r9 = r9.sheets
                 if (r9 <= r2) goto L_0x04e2
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.widget.TextView r9 = r9.mPage
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r4 = 2131624963(0x7f0e0403, float:1.887712E38)
                 java.lang.String r3 = r3.getString(r4)
                 r1.append(r3)
                 java.lang.String r3 = ": "
                 r1.append(r3)
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r3 = r3.curSheet
                 r1.append(r3)
                 java.lang.String r3 = "/"
                 r1.append(r3)
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r3 = r3.sheets
                 r1.append(r3)
                 java.lang.String r1 = r1.toString()
                 r9.setText(r1)
-                android.widget.ProgressBar r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mProgressPage
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                android.widget.ProgressBar r9 = com.epson.cameracopy.ui.CameraPrintProgress.mProgressPage
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r1 = r1.curSheet
                 int r1 = r1 * 100
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r3 = r3.sheets
                 int r1 = r1 / r3
                 r9.setProgress(r1)
             L_0x04e2:
-                int r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.copies
+                int r9 = com.epson.cameracopy.ui.CameraPrintProgress.copies
                 if (r9 <= r2) goto L_0x052a
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.widget.TextView r9 = r9.mCopies
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r4 = 2131624716(0x7f0e030c, float:1.887662E38)
                 java.lang.String r3 = r3.getString(r4)
                 r1.append(r3)
                 java.lang.String r3 = ": "
                 r1.append(r3)
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r3 = r3.curCopy
                 r1.append(r3)
                 java.lang.String r3 = "/"
                 r1.append(r3)
-                int r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.copies
+                int r3 = com.epson.cameracopy.ui.CameraPrintProgress.copies
                 r1.append(r3)
                 java.lang.String r1 = r1.toString()
                 r9.setText(r1)
-                android.widget.ProgressBar r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.mProgressCopies
-                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                android.widget.ProgressBar r9 = com.epson.cameracopy.ui.CameraPrintProgress.mProgressCopies
+                com.epson.cameracopy.ui.CameraPrintProgress r1 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r1 = r1.curCopy
                 int r1 = r1 * 100
-                int r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.copies
+                int r0 = com.epson.cameracopy.ui.CameraPrintProgress.copies
                 int r1 = r1 / r0
                 r9.setProgress(r1)
             L_0x052a:
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
-                com.epson.cameracopy.p006ui.CameraPrintProgress.access$1208(r9)
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress.access$1208(r9)
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r9 = r9.curSheet
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int r0 = r0.sheets
                 if (r9 <= r0) goto L_0x0573
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 int unused = r9.curSheet = r2
-                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
-                com.epson.cameracopy.p006ui.CameraPrintProgress.access$1308(r9)
+                com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress.access$1308(r9)
                 goto L_0x0573
             L_0x0548:
-                android.widget.ProgressBar r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.mProgressPercent
+                android.widget.ProgressBar r0 = com.epson.cameracopy.ui.CameraPrintProgress.mProgressPercent
                 r0.setProgress(r9)
-                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r0 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.widget.TextView r0 = r0.mPercent
                 java.lang.StringBuilder r1 = new java.lang.StringBuilder
                 r1.<init>()
-                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.p006ui.CameraPrintProgress.this
+                com.epson.cameracopy.ui.CameraPrintProgress r3 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 java.lang.String r3 = r3.percentString
                 r1.append(r3)
                 java.lang.String r3 = "         "
@@ -704,7 +704,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             L_0x0573:
                 return r2
             */
-            throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.CameraPrintProgress.C08464.handleMessage(android.os.Message):boolean");
+            throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.ui.CameraPrintProgress.C08464.handleMessage(android.os.Message):boolean");
         }
     });
     private ArrayList<ImageAndLayout> mImageAndLayoutList;
@@ -733,8 +733,8 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
 
     /* JADX WARNING: Code restructure failed: missing block: B:10:0x000e, code lost:
         epson.print.Util.EPLog.m307e("Epson", "mEpsonService = null");
-        mCallback = new com.epson.cameracopy.p006ui.CameraPrintProgress.C08391(r3);
-        mEpsonConnection = new com.epson.cameracopy.p006ui.CameraPrintProgress.C08442(r3);
+        mCallback = new com.epson.cameracopy.ui.CameraPrintProgress.C08391(r3);
+        mEpsonConnection = new com.epson.cameracopy.ui.CameraPrintProgress.C08442(r3);
         epson.print.Util.EPLog.m307e("Epson", "bindService() call");
         bindService(new android.content.Intent(r3, epson.print.service.EpsonService.class), mEpsonConnection, 1);
         epson.print.Util.EPLog.m307e("Epson", "bindService() finish");
@@ -790,7 +790,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             monitor-exit(r0)     // Catch:{ all -> 0x003f }
             throw r1
         */
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.CameraPrintProgress.init():void");
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.ui.CameraPrintProgress.init():void");
     }
 
     protected void onCreate(Bundle bundle) {

app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java → app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -181,7 +181,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
         public boolean handleMessage(android.os.Message r15) {
 
-            throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.CameraPrintSettingActivity.C08553.handleMessage(android.os.Message):boolean");
+            throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.ui.CameraPrintSettingActivity.C08553.handleMessage(android.os.Message):boolean");
         }
 
         private int[] removeCddvdMedia(int[] iArr) {
@@ -1066,7 +1066,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         L_0x00fc:
             return
         */
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.CameraPrintSettingActivity.onPrinterSelectEnd(int, android.content.Intent):void");
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.ui.CameraPrintSettingActivity.onPrinterSelectEnd(int, android.content.Intent):void");
     }
 
     private void endInkReplAndGoProbePrinter() {
@@ -1234,7 +1234,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.menu_done, menu);
+        getMenuInflater().inflate(R.menu.menu_done, menu);
         return super.onCreateOptionsMenu(menu);
     }
 

app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java → app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;

app/src/main/java/com/epson/cameracopy/p006ui/CurrentFolderName.java → app/src/main/java/com/epson/cameracopy/ui/CurrentFolderName.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.widget.LinearLayout;
 import android.widget.TextView;

app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeEditActivity.java → app/src/main/java/com/epson/cameracopy/ui/DocumentSizeEditActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -294,7 +294,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     public boolean onCreateOptionsMenu(Menu menu) {
         if (mDocumentSizeInfo.getPaperId() == -2) {
-            getMenuInflater().inflate(R.C2138menu.menu_done, menu);
+            getMenuInflater().inflate(R.menu.menu_done, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }

app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java → app/src/main/java/com/epson/cameracopy/ui/DocumentSizeSettingActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.AlertDialog;
 import android.app.Dialog;

app/src/main/java/com/epson/cameracopy/p006ui/FolderInformation.java → app/src/main/java/com/epson/cameracopy/ui/FolderInformation.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import java.io.File;
 import java.io.FileFilter;

app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java → app/src/main/java/com/epson/cameracopy/ui/FolderSelectActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java → app/src/main/java/com/epson/cameracopy/ui/ImageCollectView.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java → app/src/main/java/com/epson/cameracopy/ui/ImageFolderFile.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.Context;
 

app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java → app/src/main/java/com/epson/cameracopy/ui/ImageFolderFileViewModel.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;

app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java → app/src/main/java/com/epson/cameracopy/ui/ImagePreviewActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;

app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewFile.java → app/src/main/java/com/epson/cameracopy/ui/ImagePreviewFile.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.content.Context;
 

app/src/main/java/com/epson/cameracopy/p006ui/ItemData.java → app/src/main/java/com/epson/cameracopy/ui/ItemData.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/epson/cameracopy/p006ui/ItemDataAdapter.java → app/src/main/java/com/epson/cameracopy/ui/ItemDataAdapter.java

@@ -1,5 +1,6 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
+import android.app.Service;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -8,11 +9,13 @@ import android.widget.ArrayAdapter;
 
 import java.util.List;
 
+import epson.print.R;
+
 /* renamed from: com.epson.cameracopy.ui.ItemDataAdapter */
 /* compiled from: FolderSelectActivity */
 class ItemDataAdapter extends ArrayAdapter<ItemData> {
     private final Context mContext;
-    private final LayoutInflater mLayoutInflater = ((LayoutInflater) mContext.getSystemService("layout_inflater"));
+    private final LayoutInflater mLayoutInflater = ((LayoutInflater) mContext.getSystemService(Service.LAYOUT_INFLATER_SERVICE));
 
     public ItemDataAdapter(Context context, int i, List<ItemData> list) {
         super(context, i, list);

app/src/main/java/com/epson/cameracopy/p006ui/MenuControl.java → app/src/main/java/com/epson/cameracopy/ui/MenuControl.java

@@ -1,8 +1,10 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.view.Menu;
 import android.view.MenuInflater;
 
+import epson.print.R;
+
 
 /* renamed from: com.epson.cameracopy.ui.MenuControl */
 /* compiled from: FolderSelectActivity */
@@ -24,7 +26,7 @@ class MenuControl {
 
     public void CreateMenu(Menu menu) {
         if (mMenuMode != 0) {
-            mMenuInflater.inflate(R.C2138menu.menu_ok, menu);
+            mMenuInflater.inflate(R.menu.menu_ok, menu);
         }
     }
 

app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java → app/src/main/java/com/epson/cameracopy/ui/PictureResolutionDialogFragment.java

@@ -1,5 +1,6 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
+import android.app.Service;
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Bundle;
@@ -43,7 +44,7 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
     public android.app.Dialog onCreateDialog(android.os.Bundle r7) {
 
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.PictureResolutionDialogFragment.onCreateDialog(android.os.Bundle):android.app.Dialog");
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.ui.PictureResolutionDialogFragment.onCreateDialog(android.os.Bundle):android.app.Dialog");
     }
 
     public void onActivityCreated(Bundle bundle) {
@@ -103,7 +104,7 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
         public MyAdapter(Context context, int i, CharSequence[] charSequenceArr, int i2) {
             super(context, i, charSequenceArr);
-            mLayoutInflater = (LayoutInflater) context.getSystemService("layout_inflater");
+            mLayoutInflater = (LayoutInflater) context.getSystemService(Service.LAYOUT_INFLATER_SERVICE);
             mSelectNumber = i2;
         }
 

app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java → app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.AlertDialog;
 import android.arch.lifecycle.Observer;
@@ -422,7 +422,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     private boolean isPrinterChanged() {
 
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.PrintPreviewActivity.isPrinterChanged():boolean");
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.ui.PrintPreviewActivity.isPrinterChanged():boolean");
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -666,7 +666,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.C2138menu.print_menu, menu);
+        getMenuInflater().inflate(R.menu.print_menu, menu);
         return true;
     }
 

app/src/main/java/com/epson/cameracopy/p006ui/SimpleMessageDialogFragment.java → app/src/main/java/com/epson/cameracopy/ui/SimpleMessageDialogFragment.java

@@ -1,4 +1,4 @@
-package com.epson.cameracopy.p006ui;
+package com.epson.cameracopy.ui;
 
 import android.app.AlertDialog;
 import android.app.Dialog;

app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java

@@ -235,7 +235,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
     public boolean onCreateOptionsMenu(Menu menu) {
         int selectedFileNum = mImageFileListAdapter.getSelectedFileNum();
-        getMenuInflater().inflate(R.C2138menu.menu_image_selector, menu);
+        getMenuInflater().inflate(R.menu.menu_image_selector, menu);
         menu.findItem(R.id.action_go_preview).setEnabled(selectedFileNum > 0);
         if (selectedFileNum <= 0) {
             setTitle(mImageFileListAdapter.getTargetDirectoryName());

app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java

@@ -479,7 +479,7 @@ public class EscprLib {
         for (int i = 0; i < 4; i++) {
             byteArrayOutputStream.write(random.nextInt());
         }
-        String macAddress = ((WifiManager) context.getApplicationContext().getSystemService("wifi")).getConnectionInfo().getMacAddress();
+        String macAddress = ((WifiManager) context.getApplicationContext().getSystemService(Service.WIFI_SERVICE)).getConnectionInfo().getMacAddress();
         if (macAddress != null) {
             EpLog.m69d("getEngineId macAdress = " + macAddress);
             String[] split = macAddress.split(":", 6);

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java

@@ -60,7 +60,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         requestWindowFeature(1);
         searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java

@@ -32,7 +32,7 @@ public class ActivityControlWiFi extends Activity {
     protected void onCreate(Bundle bundle) {
         EPLog.m86d(TAG, "onCreate()");
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         requestWindowFeature(1);
         Bundle extras = getIntent().getExtras();
         if (extras != null) {

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java

@@ -59,7 +59,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
 
     public boolean onCreateOptionsMenu(Menu menu) {
         if (this.bSupportCancel) {
-            getMenuInflater().inflate(R.C2138menu.menu_cancel, menu);
+            getMenuInflater().inflate(R.menu.menu_cancel, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java

@@ -75,7 +75,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectManual.lambda$onCreate$0(ActivityWiFiDirectManual.this, (Deque) obj);
             }
         });
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java

@@ -65,7 +65,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         wiFiUtils = WiFiUtils.getInstance(this);
         if (engineId == null) {
             engineId = getEngineId();

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java

@@ -27,7 +27,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);

app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java

@@ -36,7 +36,7 @@ public class ManageDefaultNetwork {
     private ManageDefaultNetwork(Context context) {
         mContext = context.getApplicationContext();
         connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
-        wifiManager = (WifiManager) mContext.getSystemService("wifi");
+        wifiManager = (WifiManager) mContext.getSystemService(Service.WIFI_SERVICE);
     }
 
     public static ManageDefaultNetwork getInstance(Context context) {

app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -113,7 +113,7 @@ public class SearchWiFiDirectPrinterTask {
 
     private SearchWiFiDirectPrinterTask(Context context2) {
         context = context2.getApplicationContext();
-        mWifiManager = (WifiManager) context2.getSystemService("wifi");
+        mWifiManager = (WifiManager) context2.getSystemService(Service.WIFI_SERVICE);
         mWiFiP2PManager = (WifiP2pManager) context2.getSystemService("wifip2p");
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectManager.java

@@ -28,7 +28,7 @@ public class WiFiDirectManager {
     }
 
     public static boolean isWifiEnabled(Context context) {
-        return ((WifiManager) context.getSystemService("wifi")).isWifiEnabled();
+        return ((WifiManager) context.getSystemService(Service.WIFI_SERVICE)).isWifiEnabled();
     }
 
     public static boolean isSimpleAP(Context context) {

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java

@@ -41,7 +41,7 @@ public class WiFiUtils {
     private WifiManager f159wm = null;
 
     private WiFiUtils(Context context) {
-        f159wm = (WifiManager) context.getApplicationContext().getApplicationContext().getSystemService("wifi");
+        f159wm = (WifiManager) context.getApplicationContext().getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         f158cm = (ConnectivityManager) context.getApplicationContext().getApplicationContext().getSystemService("connectivity");
     }
 

app/src/main/java/epson/colorcorrection/ImageCollect.java

@@ -10,7 +10,7 @@ import android.os.Environment;
 
 import android.text.format.DateFormat;
 import android.util.Log;
-import com.epson.cameracopy.p006ui.CropImageActivity;
+import com.epson.cameracopy.ui.CropImageActivity;
 import epson.print.Util.OpenCvHelper;
 import java.io.File;
 import java.io.FileFilter;
@@ -788,7 +788,7 @@ public class ImageCollect {
         r7 = r7.y;
      */
     /* Code decompiled incorrectly, please refer to instructions dump. */
-    private org.opencv.core.Mat MakeImageBCSC(org.opencv.core.Mat r25, com.epson.cameracopy.p006ui.CropImageActivity.CorrectionParamSet r26) {
+    private org.opencv.core.Mat MakeImageBCSC(org.opencv.core.Mat r25, com.epson.cameracopy.ui.CropImageActivity.CorrectionParamSet r26) {
         /*
             r24 = this;
             r0 = r26

app/src/main/java/epson/common/Utils.java

@@ -197,7 +197,7 @@ public class Utils {
 
     public static String getSSID(Context context) {
         try {
-            return ((WifiManager) context.getSystemService("wifi")).getConnectionInfo().getSSID();
+            return ((WifiManager) context.getSystemService(Service.WIFI_SERVICE)).getConnectionInfo().getSSID();
         } catch (SecurityException e) {
             e.printStackTrace();
             return null;

app/src/main/java/epson/common/ble/util/BLEUtility.java

@@ -1,9 +1,13 @@
 package com.epson.mobilephone.common.ble.util;
 
+import android.app.Service;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.epson.mobilephone.common.EpLog;
 
 public class BLEUtility {
@@ -24,7 +28,7 @@ public class BLEUtility {
     }
 
     public static BluetoothManager getManager(Context context) {
-        return (BluetoothManager) context.getSystemService("bluetooth");
+        return (BluetoothManager) context.getSystemService(Service.WIFI_SERVICE);
     }
 
     @NonNull

app/src/main/java/epson/common/escpr/EscprLib.java

@@ -479,7 +479,7 @@ public class EscprLib {
         for (int i = 0; i < 4; i++) {
             byteArrayOutputStream.write(random.nextInt());
         }
-        String macAddress = ((WifiManager) context.getApplicationContext().getSystemService("wifi")).getConnectionInfo().getMacAddress();
+        String macAddress = ((WifiManager) context.getApplicationContext().getSystemService(Service.WIFI_SERVICE)).getConnectionInfo().getMacAddress();
         if (macAddress != null) {
             EpLog.m69d("getEngineId macAdress = " + macAddress);
             String[] split = macAddress.split(":", 6);

app/src/main/java/epson/common/wifidirect/ActivityConnectBase.java

@@ -60,7 +60,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         requestWindowFeature(1);
         searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
     }

app/src/main/java/epson/common/wifidirect/ActivityControlWiFi.java

@@ -32,7 +32,7 @@ public class ActivityControlWiFi extends Activity {
     protected void onCreate(Bundle bundle) {
         EPLog.m86d(TAG, "onCreate()");
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         requestWindowFeature(1);
         Bundle extras = getIntent().getExtras();
         if (extras != null) {

app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectBase.java

@@ -59,7 +59,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
 
     public boolean onCreateOptionsMenu(Menu menu) {
         if (this.bSupportCancel) {
-            getMenuInflater().inflate(R.C2138menu.menu_cancel, menu);
+            getMenuInflater().inflate(R.menu.menu_cancel, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }

app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectManual.java

@@ -75,7 +75,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectManual.lambda$onCreate$0(ActivityWiFiDirectManual.this, (Deque) obj);
             }
         });
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);

app/src/main/java/epson/common/wifidirect/ActivityiPrintConnect.java

@@ -65,7 +65,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         wiFiUtils = WiFiUtils.getInstance(this);
         if (engineId == null) {
             engineId = getEngineId();

app/src/main/java/epson/common/wifidirect/ActivityiPrintConnectStart.java

@@ -1,5 +1,6 @@
 package com.epson.mobilephone.common.wifidirect;
 
+import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -15,6 +16,8 @@ import com.epson.mobilephone.common.wifidirect.escprLib;
 import java.util.ArrayList;
 import java.util.List;
 
+import epson.print.R;
+
 public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
     private static final int ID_ENABLED_LOCATION_SETTINGS = 1;
     public static final String TAG = "ActivityiPrintConnectStart";
@@ -27,7 +30,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);

app/src/main/java/epson/common/wifidirect/ManageDefaultNetwork.java

@@ -36,7 +36,7 @@ public class ManageDefaultNetwork {
     private ManageDefaultNetwork(Context context) {
         mContext = context.getApplicationContext();
         connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
-        wifiManager = (WifiManager) mContext.getSystemService("wifi");
+        wifiManager = (WifiManager) mContext.getSystemService(Service.WIFI_SERVICE);
     }
 
     public static ManageDefaultNetwork getInstance(Context context) {

app/src/main/java/epson/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -113,7 +113,7 @@ public class SearchWiFiDirectPrinterTask {
 
     private SearchWiFiDirectPrinterTask(Context context2) {
         context = context2.getApplicationContext();
-        mWifiManager = (WifiManager) context2.getSystemService("wifi");
+        mWifiManager = (WifiManager) context2.getSystemService(Service.WIFI_SERVICE);
         mWiFiP2PManager = (WifiP2pManager) context2.getSystemService("wifip2p");
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {

app/src/main/java/epson/common/wifidirect/WiFiDirectManager.java

@@ -28,7 +28,7 @@ public class WiFiDirectManager {
     }
 
     public static boolean isWifiEnabled(Context context) {
-        return ((WifiManager) context.getSystemService("wifi")).isWifiEnabled();
+        return ((WifiManager) context.getSystemService(Service.WIFI_SERVICE)).isWifiEnabled();
     }
 
     public static boolean isSimpleAP(Context context) {

app/src/main/java/epson/common/wifidirect/WiFiUtils.java

@@ -41,7 +41,7 @@ public class WiFiUtils {
     private WifiManager f159wm = null;
 
     private WiFiUtils(Context context) {
-        f159wm = (WifiManager) context.getApplicationContext().getApplicationContext().getSystemService("wifi");
+        f159wm = (WifiManager) context.getApplicationContext().getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         f158cm = (ConnectivityManager) context.getApplicationContext().getApplicationContext().getSystemService("connectivity");
     }
 

app/src/main/java/epson/print/ActivityDocsPrintPreview.java

@@ -1865,7 +1865,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.C2138menu.print_menu, menu);
+        getMenuInflater().inflate(R.menu.print_menu, menu);
         return true;
     }
 

app/src/main/java/epson/print/ActivityPrintWeb.java

@@ -517,7 +517,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.C2138menu.print_menu, menu);
+        getMenuInflater().inflate(R.menu.print_menu, menu);
         return true;
     }
 

app/src/main/java/epson/print/ActivityViewImageSelect.java

@@ -1257,7 +1257,7 @@ public class ActivityViewImageSelect extends ActivityIACommon implements View.On
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.C2138menu.print_menu, menu);
+        getMenuInflater().inflate(R.menu.print_menu, menu);
         return true;
     }
 

app/src/main/java/epson/print/IprintHome.java

@@ -273,7 +273,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.C2138menu.information_menu, menu);
+        getMenuInflater().inflate(R.menu.information_menu, menu);
         return true;
     }
 

app/src/main/java/epson/print/IprintHomeMenuLogging.java

@@ -3,7 +3,7 @@ package epson.print;
 import android.content.Context;
 
 
-import com.epson.cameracopy.p006ui.CameraPreviewActivity;
+import com.epson.cameracopy.ui.CameraPreviewActivity;
 import com.epson.iprint.prtlogger.Analytics;
 import com.epson.memcardacc.MemcardPhotocopyTop;
 import com.epson.memcardacc.MemcardTop;

app/src/main/java/epson/print/WebviewActivity.java

@@ -578,7 +578,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.print_option_menu, menu);
+        getMenuInflater().inflate(R.menu.print_option_menu, menu);
         return true;
     }
 

app/src/main/java/epson/print/storage/StorageProcessActivity.java

@@ -131,7 +131,7 @@ public abstract class StorageProcessActivity extends StorageActivity {
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.menu_sign_inout, menu);
+        getMenuInflater().inflate(R.menu.menu_sign_inout, menu);
         if (mStorageServiceClient.isSignedIn(this)) {
             menu.removeItem(R.id.menu_signin);
             menu.findItem(R.id.menu_signout).setEnabled(this.bEnableSighIn);

app/src/main/java/epson/print/storage/StorageSignInActivity.java

@@ -137,7 +137,7 @@ public abstract class StorageSignInActivity extends StorageActivity {
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.menu_sign_inout, menu);
+        getMenuInflater().inflate(R.menu.menu_sign_inout, menu);
         menu.removeItem(R.id.menu_signout);
         return super.onCreateOptionsMenu(menu);
     }

app/src/main/java/epson/print/storage/gdrivev3/ListAndDownloadActivity.java

@@ -144,7 +144,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.menu_sign_inout, menu);
+        getMenuInflater().inflate(R.menu.menu_sign_inout, menu);
         if (mSignInOutButtonType == 0) {
             menu.removeItem(R.id.menu_signout);
             menu.findItem(R.id.menu_signin).setEnabled(mSignInOutButtonEnabled);

app/src/main/java/epson/scan/activity/CustomButtonWrapper.java

@@ -5,12 +5,15 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.DrawableRes;
 
 
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class CustomButtonWrapper {
     private final Button mButton;
     private final int mDrawableId;

app/src/main/java/epson/scan/activity/I2ScanActivity.java

@@ -363,7 +363,7 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.scan_menu, menu);
+        getMenuInflater().inflate(R.menu.scan_menu, menu);
         return true;
     }
 

app/src/main/java/epson/scan/activity/I2ScanSettingActivity.java

@@ -257,7 +257,7 @@ public class I2ScanSettingActivity extends ActivityIACommon implements View.OnCl
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.menu_done, menu);
+        getMenuInflater().inflate(R.menu.menu_done, menu);
         return true;
     }
 

app/src/main/java/epson/scan/activity/MailActivity.java

@@ -53,8 +53,8 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
         mFileName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             public void onFocusChange(View view, boolean z) {
                 if (!z) {
-                    MailActivity.mFileName.extendSelection(0);
-                    MailActivity.mFileName.setSelection(0);
+                    mFileName.extendSelection(0);
+                    mFileName.setSelection(0);
                 }
             }
         });
@@ -69,10 +69,10 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
                 switch (i) {
                     case R.id.save_as_jpeg_type /*2131231434*/:
-                        String unused = MailActivity.mFileType = Constants.JPEG_TYPE;
+                        String unused = mFileType = Constants.JPEG_TYPE;
                         return;
                     case R.id.save_as_pdf_type /*2131231435*/:
-                        String unused2 = MailActivity.mFileType = Constants.PDF_TYPE;
+                        String unused2 = mFileType = Constants.PDF_TYPE;
                         return;
                     default:
                         return;
@@ -82,16 +82,16 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
         saveFilePathArray = getIntent().getStringArrayListExtra(Define.SAVING_FILE_PATH);
         count = ScanFileNumber.getCount(this);
         EditText editText = mFileName;
-        editText.setText(getString(R.string.f448epson) + utils.editNumber(this.count));
+        editText.setText(getString(R.string.epson) + utils.editNumber(count));
         for (int i = 0; i < saveFilePathArray.size(); i++) {
-            fileAttachment = new File(this.saveFilePathArray.get(i));
-            fileSizeInByte = Long.valueOf(this.fileAttachment.length());
-            fileSizeInKb = (float) (this.fileSizeInByte.longValue() / PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID);
+            fileAttachment = new File(saveFilePathArray.get(i));
+            fileSizeInByte = Long.valueOf(fileAttachment.length());
+            fileSizeInKb = (float) (fileSizeInByte.longValue() / PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID);
             EPLog.m313i("Data", " " + fileSizeInKb);
             totalFileSize = totalFileSize + fileSizeInKb;
         }
-        if (this.totalFileSize > 500.0f) {
-            ((TextView) findViewById(R.id.save_as_file_size)).setText("" + MyUtility.mathRound((double) (this.totalFileSize / 1024.0f), 2) + "MB");
+        if (totalFileSize > 500.0f) {
+            ((TextView) findViewById(R.id.save_as_file_size)).setText("" + MyUtility.mathRound((double) (totalFileSize / 1024.0f), 2) + "MB");
         } else {
             ((TextView) findViewById(R.id.save_as_file_size)).setText("" + MyUtility.mathRound((double) totalFileSize, 2) + "KB");
         }
@@ -106,13 +106,13 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
             }
 
             public void afterTextChanged(Editable editable) {
-                if (MailActivity.mFileName.getText().toString().equals("")) {
-                    MailActivity.this.clearBtn.setVisibility(8);
-                    MailActivity.this.saveBtn.setEnabled(false);
+                if (mFileName.getText().toString().equals("")) {
+                    clearBtn.setVisibility(8);
+                    saveBtn.setEnabled(false);
                     return;
                 }
-                MailActivity.this.clearBtn.setVisibility(0);
-                MailActivity.this.saveBtn.setEnabled(true);
+                clearBtn.setVisibility(0);
+                saveBtn.setEnabled(true);
             }
         });
     }
@@ -133,10 +133,10 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
                     z = false;
                 } else {
                     String obj = mFileName.getText().toString();
-                    if (!obj.equals("EPSON" + utils.editNumber(this.count))) {
+                    if (!obj.equals("EPSON" + utils.editNumber(count))) {
                         str = mFileName.getText().toString();
                         z = true;
-                    } else if (this.saveFilePathArray.size() == 1) {
+                    } else if (saveFilePathArray.size() == 1) {
                         str = mFileName.getText().toString();
                         z = false;
                     } else {
@@ -149,7 +149,7 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
                         libHaru libharu = new libHaru();
                         String scannedImageDir = ExternalFileUtils.getInstance(this).getScannedImageDir();
                         String path = new File(scannedImageDir, str + CommonDefine.FileType_PDF).getPath();
-                        libharu.createPDF(this.saveFilePathArray, path);
+                        libharu.createPDF(saveFilePathArray, path);
                         emailIntent = new Intent("android.intent.action.SEND");
                         fileAttachment = new File(path);
                         Uri uriForFile = ScannedFileProvider.getUriForFile(this, fileAttachment);
@@ -160,7 +160,7 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
                         emailIntent = new Intent("android.intent.action.SEND_MULTIPLE");
                         int i = count;
                         ExternalFileUtils.getInstance(this).createTempFolder(ExternalFileUtils.getInstance(this).getScannedImageDir());
-                        if (this.saveFilePathArray.size() == 1) {
+                        if (saveFilePathArray.size() == 1) {
                             fileAttachment = MyUtility.createTempFile(this, saveFilePathArray.get(0), str + ".jpg");
                             arrayList.add(ScannedFileProvider.getUriForFile(this, fileAttachment));
                         } else {
@@ -178,7 +178,7 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
                     emailIntent.setType("message/rfc822");
                     emailIntent.putExtra("android.intent.extra.SUBJECT", getString(R.string.app_name));
                     emailIntent.putExtra("android.intent.extra.TEXT", getString(R.string.using_Epson_iPrint));
-                    startActivityForResult(Intent.createChooser(this.emailIntent, "Send mail..."), 1);
+                    startActivityForResult(Intent.createChooser(emailIntent, "Send mail..."), 1);
                     return;
                 } catch (Exception e) {
                     e.printStackTrace();

app/src/main/java/epson/scan/activity/ScanActivity.java

@@ -1116,7 +1116,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.scan_menu, menu);
+        getMenuInflater().inflate(R.menu.scan_menu, menu);
         super.onCreateOptionsMenu(menu);
         return true;
     }

app/src/main/java/epson/scan/activity/ScanSettingsActivity.java

@@ -616,7 +616,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.C2138menu.menu_done, menu);
+        getMenuInflater().inflate(R.menu.menu_done, menu);
         return super.onCreateOptionsMenu(menu);
     }
 

app/src/main/java/epson/support/DeviceInformationActivity.java

@@ -252,7 +252,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
     }
 
     private String getIpAddressFromWiFi() {
-        int ipAddress = ((WifiManager) getApplicationContext().getSystemService("wifi")).getConnectionInfo().getIpAddress();
+        int ipAddress = ((WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE)).getConnectionInfo().getIpAddress();
         if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) {
             ipAddress = Integer.reverseBytes(ipAddress);
         }

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

@@ -0,0 +1,10 @@
+<?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"/>
+        </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"/>
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,8 @@
+<?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>

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

@@ -0,0 +1,7 @@
+<?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"/>
+    </LinearLayout>
+</ScrollView>

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

@@ -0,0 +1,4 @@
+<?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>

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

@@ -0,0 +1,7 @@
+<?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>

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

@@ -0,0 +1,5 @@
+<?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>

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

@@ -0,0 +1,8 @@
+<?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>
+    <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

@@ -0,0 +1,8 @@
+<?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>
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?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>
+</LinearLayout>

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

@@ -0,0 +1,45 @@
+<?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>
+                <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"/>
+                </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"/>
+                </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"/>
+                </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"/>
+                </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"/>
+                </RelativeLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>

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

@@ -0,0 +1,6 @@
+<?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>

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

@@ -0,0 +1,114 @@
+<?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"/>
+    </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"/>
+                    </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"/>
+                </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>
+                </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"/>
+                </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>
+            </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>
+                <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"/>
+                </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"/>
+                </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"/>
+                </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"/>
+                </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>
+                <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"/>
+                </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>
+        <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"/>
+</RelativeLayout>

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

@@ -0,0 +1,6 @@
+<?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>

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

@@ -0,0 +1,31 @@
+<?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"/>
+            </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>
+        </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"/>
+            </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>
+    </LinearLayout>
+</RelativeLayout>

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

@@ -0,0 +1,7 @@
+<?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"/>
+    </FrameLayout>
+</LinearLayout>

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

@@ -0,0 +1,65 @@
+<?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"/>
+            </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>
+                <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"/>
+                </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"/>
+                </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"/>
+                </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>
+            <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"/>
+                        </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"/>
+                        </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>
+                </RelativeLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>

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

@@ -0,0 +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: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"/>
+</LinearLayout>

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

@@ -0,0 +1,6 @@
+<?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>

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

@@ -0,0 +1,12 @@
+<?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>
+    </ScrollView>
+</LinearLayout>

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

@@ -0,0 +1,5 @@
+<?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>

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

@@ -0,0 +1,15 @@
+<?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>
+            <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"/>
+</LinearLayout>

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

@@ -0,0 +1,6 @@
+<?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>

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

@@ -0,0 +1,6 @@
+<?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>

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

@@ -0,0 +1,5 @@
+<?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>

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

@@ -0,0 +1,10 @@
+<?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>
+    <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

@@ -0,0 +1,4 @@
+<?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>

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

@@ -0,0 +1,31 @@
+<?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"/>
+            </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>
+            <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>
+            <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"/>
+        </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>
+    </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>
+</RelativeLayout>

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

@@ -0,0 +1,8 @@
+<?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"/>
+    </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"/>
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?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"/>
+    </FrameLayout>
+</LinearLayout>

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

@@ -0,0 +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: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>
+</FrameLayout>

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

@@ -0,0 +1,31 @@
+<?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"/>
+            </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"/>
+            </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"/>
+            </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"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>