0

app/build.gradle

@@ -20,6 +20,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            multiDexEnabled true
         }
     }
     compileOptions {
@@ -27,6 +28,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     flavorDimensions 'flavor1'
+    productFlavors {
+        produdctflavor {
+            dimension 'flavor1'
+        }
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -78,7 +78,7 @@
         <activity
             android:name="epson.print.ActivityViewImageSelect"
             android:configChanges="locale|keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|layoutDirection|fontScale"
-            android:hardwareAccelerated="@bool/enableHardwareAccelerated"
+            android:hardwareAccelerated="false"
             android:resizeableActivity="false"
             android:screenOrientation="unspecified">
             <intent-filter>

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

@@ -321,13 +321,13 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
         switch (this.printerLocation) {
             case 1:
-                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_local);
                 return;
             case 2:
-                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_remote);
                 return;
             case 3:
-                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_ip);
                 return;
             default:
                 return;

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

@@ -21,7 +21,7 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.text.TextUtils;
 import android.util.AttributeSet;

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

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;

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

@@ -13,7 +13,7 @@ import android.graphics.Bitmap;
 import android.media.ExifInterface;
 import android.os.Bundle;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.view.LayoutInflater;

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

@@ -21,11 +21,11 @@ class ItemData {
         ImageView imageView = (ImageView) view.findViewById(R.id.file_item_image);
         TextView textView = (TextView) view.findViewById(R.id.file_item_text);
         if (mFileName != null) {
-            imageView.setImageResource(R.C2136drawable.folder);
+            imageView.setImageResource(R.drawable.folder);
             textView.setText(mFileName);
             return;
         }
-        imageView.setImageResource(R.C2136drawable.parent_folder);
+        imageView.setImageResource(R.drawable.parent_folder);
         textView.setText("");
     }
 }

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

@@ -4,7 +4,7 @@ import android.app.Service;
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -18,7 +18,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.KeyEvent;
 import android.view.Menu;

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 
 
 /* renamed from: com.epson.cameracopy.ui.SimpleMessageDialogFragment */

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 
 
 public class AltAlertDialogFragment extends DialogFragment {

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

@@ -36,7 +36,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         options.inPurgeable = true;
         options.inScaled = false;
         try {
-            mSelectPictureBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.C2136drawable.select_picture, options);
+            mSelectPictureBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.select_picture, options);
         } catch (OutOfMemoryError e) {
             EPLog.m307e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
         }

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

@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.StatFs;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
 import android.widget.TextView;

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

@@ -8,7 +8,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
 import android.widget.TextView;

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

@@ -59,18 +59,18 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
             textView.setVisibility(4);
         } else if (fileInfoWithCheck.isDirectory()) {
             if (fileInfoWithCheck.isParentDirectory()) {
-                imageView.setImageResource(R.C2136drawable.parent_folder);
+                imageView.setImageResource(R.drawable.parent_folder);
                 String str = mUpFolderString;
                 if (str != null) {
                     textView.setText(str);
                 }
             } else {
-                imageView.setImageResource(R.C2136drawable.folder);
+                imageView.setImageResource(R.drawable.folder);
                 textView.setText(fileInfoWithCheck.getFileName());
             }
             textView.setVisibility(View.VISIBLE);
         } else {
-            imageView.setImageResource(R.C2136drawable.image);
+            imageView.setImageResource(R.drawable.image);
             textView.setVisibility(4);
         }
         ImageView imageView2 = (ImageView) view.findViewById(R.id.checkImage);

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 
 
 public class LocalAlertDialogFragment extends DialogFragment {

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

@@ -4,7 +4,7 @@ import android.app.Dialog;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -11,7 +11,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.Menu;
 import android.view.MenuItem;

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 
 
 public class MemcardTempAlertDialogFragment extends DialogFragment {

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

@@ -4,7 +4,7 @@ import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProviders;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 
 import com.epson.memcardacc.LocalAlertDialogFragment;

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java

@@ -10,7 +10,7 @@ import android.net.Uri;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 
 

app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java

@@ -55,13 +55,13 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
 
     private Drawable getThresholdIcon(int i) {
         Resources resources = getContext().getResources();
-        int i2 = R.C2136drawable.signal_1;
+        int i2 = R.drawable.signal_1;
         if (i >= -60) {
             EpLog.m77i("HIGH_SIGNAL");
-            i2 = R.C2136drawable.signal_3;
+            i2 = R.drawable.signal_3;
         } else if (i >= -70) {
             EpLog.m77i("MID_SIGNAL");
-            i2 = R.C2136drawable.signal_2;
+            i2 = R.drawable.signal_2;
         } else if (i >= -75) {
             EpLog.m77i("LOW_SIGNAL");
         }

app/src/main/java/com/epson/mobilephone/common/license/SimpleMessageDialogFragment.java

@@ -6,7 +6,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.p000v4.app.DialogFragment;
+
 
 public class SimpleMessageDialogFragment extends DialogFragment {
     private static final String PARAM_DIALOG_ID = "dialog_id";

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

@@ -18,7 +18,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
 

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

@@ -14,7 +14,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
 

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

@@ -10,7 +10,7 @@ import android.os.Handler;
 import android.os.Message;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -5,7 +5,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentManager;
 
 import android.view.View;

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

@@ -5,7 +5,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentManager;
 
 import android.view.View;

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

@@ -3,14 +3,15 @@ package epson.common;
 import android.app.Application;
 import android.content.Context;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 
-import org.apache.commons.lang.CharEncoding;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import epson.print.R;
 
 public class InformationGuide extends Application {
     public static int GUIDE_VER;
@@ -44,7 +45,7 @@ public class InformationGuide extends Application {
             byte[] bArr = new byte[open.available()];
             open.read(bArr);
             open.close();
-            return new String(bArr, CharEncoding.UTF_8);
+            return new String(bArr);
         } catch (IOException e) {
             e.printStackTrace();
             return null;

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

@@ -10,7 +10,7 @@ import android.net.Uri;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 
 

app/src/main/java/epson/common/license/SimpleMessageDialogFragment.java

@@ -6,7 +6,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.p000v4.app.DialogFragment;
+
 
 public class SimpleMessageDialogFragment extends DialogFragment {
     private static final String PARAM_DIALOG_ID = "dialog_id";

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

@@ -18,7 +18,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
 

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

@@ -14,7 +14,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
 

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

@@ -10,7 +10,7 @@ import android.os.Handler;
 import android.os.Message;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -5,7 +5,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentManager;
 
 import android.view.View;

app/src/main/java/epson/maintain/BatteryInfoAdapter.java

@@ -125,7 +125,7 @@ public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
 
         static void setBatteryIcon(Activity activity, BatteryInfoList batteryInfoList, int i, int i2, int i3) {
             if (batteryIsUnknown(i, i2)) {
-                batteryInfoList.setBatteryStatusIcon(R.C2136drawable.bi_not_inserted);
+                batteryInfoList.setBatteryStatusIcon(R.drawable.bi_not_inserted);
                 return;
             }
             batteryInfoList.setBatteryStatusIcon(activity.getResources().getIdentifier(String.format("bi_%s_%d", new Object[]{i2 == 1 ? "charge" : "running", Integer.valueOf((76 > i3 || i3 > 100) ? (51 > i3 || i3 >= 76) ? (26 > i3 || i3 >= 51) ? (i3 <= 0 || i3 >= 26) ? 0 : 39 : 59 : 89 : 100)}), "drawable", activity.getPackageName()));

app/src/main/java/epson/maintain/activity/CheckEulaActivity.java

@@ -6,6 +6,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.epson.mobilephone.common.license.RestoreScrollView;
 
 import epson.common.IprintLicenseInfo;
@@ -21,6 +23,7 @@ public class CheckEulaActivity extends AppCompatActivity {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.activity_check_eula);
+
         ((Button) findViewById(R.id.eulaAgreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 CheckEulaActivity.this.finishWithResult(-1);

app/src/main/java/epson/maintain/activity/EccPrintLog.java

@@ -4,7 +4,7 @@ import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProviders;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;

app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java

@@ -9,7 +9,7 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.support.p003v7.app.AppCompatActivity;
 import android.view.View;

app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -22,7 +22,7 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.ColorRes;
 
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.support.p000v4.content.ContextCompat;
 import android.support.p000v4.view.ViewCompat;
@@ -248,16 +248,16 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     switch (MaintainActivity.this.printerLocation) {
                         case 2:
                             ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
+                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_remote);
                             break;
                         case 3:
                             ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
+                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_ip);
                             break;
                         default:
                             if (!MaintainActivity.this.printerName.equals("")) {
                                 ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
+                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_local);
                                 break;
                             } else {
                                 ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.GONE);
@@ -909,7 +909,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 return;
             case R.id.head_clean_view /*2131231097*/:
                 Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_MAINTENANCE_HEAD_CLEANING);
-                AlertDialog.Builder icon = new AlertDialog.Builder(this).setIcon(R.C2136drawable.ic_action_warning);
+                AlertDialog.Builder icon = new AlertDialog.Builder(this).setIcon(R.drawable.ic_action_warning);
                 if (view.getId() != R.id.nozzle_check_view) {
                     i = R.string.str_head_clean;
                 }
@@ -933,7 +933,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 return;
             case R.id.nozzle_check_view /*2131231280*/:
                 Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_MAINTENANCE_NOZZLE_CHECK);
-                AlertDialog.Builder icon2 = new AlertDialog.Builder(this).setIcon(R.C2136drawable.ic_action_warning);
+                AlertDialog.Builder icon2 = new AlertDialog.Builder(this).setIcon(R.drawable.ic_action_warning);
                 if (view.getId() != R.id.nozzle_check_view) {
                     i = R.string.str_head_clean;
                 }

app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java

@@ -12,7 +12,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
@@ -654,9 +654,9 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mLocalButton = (RadioButton) mLayout.findViewById(R.id.btn_local);
         mIpButton = (RadioButton) mLayout.findViewById(R.id.btn_ip);
         mRemoteButton = (RadioButton) mLayout.findViewById(R.id.btn_remote);
-        Utils.setDrawble2TextView(this, mLocalButton, R.C2136drawable.printer_selector_icon_local);
-        Utils.setDrawble2TextView(this, mIpButton, R.C2136drawable.printer_selector_icon_ip);
-        Utils.setDrawble2TextView(this, mRemoteButton, R.C2136drawable.printer_selector_icon_remote);
+        Utils.setDrawble2TextView(this, mLocalButton, R.drawable.printer_selector_icon_local);
+        Utils.setDrawble2TextView(this, mIpButton, R.drawable.printer_selector_icon_ip);
+        Utils.setDrawble2TextView(this, mRemoteButton, R.drawable.printer_selector_icon_remote);
         TextView textView = null;
         switch (this.printer_location) {
             case 1:
@@ -867,7 +867,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
         switch (menuItem.getItemId()) {
             case 1:
-                new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.C2136drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
+                new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         Message obtainMessage = MaintainPrinterSearchActivity.mHandler.obtainMessage();
                         obtainMessage.what = 6;

app/src/main/java/epson/maintain/activity/NozzleGuidanceDialog.java

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -578,7 +578,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 case 100:
                     ArrayList unused21 = ActivityDocsPrintPreview.this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
                     if (ActivityDocsPrintPreview.this.aPaperSourceSetting == null) {
-                        ActivityDocsPrintPreview.mSizeInfo.setBackground(ActivityDocsPrintPreview.this.getResources().getDrawable(R.C2136drawable.text_view_boder));
+                        ActivityDocsPrintPreview.mSizeInfo.setBackground(ActivityDocsPrintPreview.this.getResources().getDrawable(R.drawable.text_view_boder));
                         ActivityDocsPrintPreview.mSizeInfo.setTextColor(ActivityDocsPrintPreview.this.getResources().getColor(R.color.epson_blue));
                         ActivityDocsPrintPreview.this.paperMissmath.setVisibility(View.GONE);
                         break;
@@ -650,10 +650,10 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ActivityDocsPrintPreview.mPre.setBackgroundResource(R.C2136drawable.bt_left_hover);
+                        ActivityDocsPrintPreview.mPre.setBackgroundResource(R.drawable.bt_left_hover);
                         return false;
                     case 1:
-                        ActivityDocsPrintPreview.mPre.setBackgroundResource(R.C2136drawable.bt_left);
+                        ActivityDocsPrintPreview.mPre.setBackgroundResource(R.drawable.bt_left);
                         return false;
                     default:
                         return false;
@@ -665,10 +665,10 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ActivityDocsPrintPreview.mNext.setBackgroundResource(R.C2136drawable.bt_right_hover);
+                        ActivityDocsPrintPreview.mNext.setBackgroundResource(R.drawable.bt_right_hover);
                         return false;
                     case 1:
-                        ActivityDocsPrintPreview.mNext.setBackgroundResource(R.C2136drawable.bt_right_1);
+                        ActivityDocsPrintPreview.mNext.setBackgroundResource(R.drawable.bt_right_1);
                         return false;
                     default:
                         return false;
@@ -1235,7 +1235,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         } else {
             View inflate2 = LayoutInflater.from(this).inflate(R.layout.pdf_file_password, (ViewGroup) null);
             final EditText editText = (EditText) inflate2.findViewById(R.id.etPassword);
-            return new AlertDialog.Builder(this).setIcon(R.C2136drawable.file).setTitle(getString(R.string.str_enter_pass)).setView(inflate2).setCancelable(false).setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
+            return new AlertDialog.Builder(this).setIcon(R.drawable.file).setTitle(getString(R.string.str_enter_pass)).setView(inflate2).setCancelable(false).setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     String unused = ActivityDocsPrintPreview.this.pdfpass = editText.getText().toString();
                     if (!ActivityDocsPrintPreview.mPdfRender.openPdfFile(ActivityDocsPrintPreview.this.docFileName, ActivityDocsPrintPreview.this.pdfpass, ActivityDocsPrintPreview.this)) {

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

@@ -274,7 +274,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                         ActivityPrintWeb.this.paperMissmath.setVisibility(View.GONE);
                     }
                 } else {
-                    ActivityPrintWeb.mSizeInfo.setBackground(ActivityPrintWeb.this.getResources().getDrawable(R.C2136drawable.text_view_boder));
+                    ActivityPrintWeb.mSizeInfo.setBackground(ActivityPrintWeb.this.getResources().getDrawable(R.drawable.text_view_boder));
                     ActivityPrintWeb.mSizeInfo.setTextColor(ActivityPrintWeb.this.getResources().getColor(R.color.epson_blue));
                     ActivityPrintWeb.this.paperMissmath.setVisibility(View.GONE);
                 }
@@ -343,10 +343,10 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ActivityPrintWeb.mPre.setBackgroundResource(R.C2136drawable.bt_left_hover);
+                        ActivityPrintWeb.mPre.setBackgroundResource(R.drawable.bt_left_hover);
                         return false;
                     case 1:
-                        ActivityPrintWeb.mPre.setBackgroundResource(R.C2136drawable.bt_left);
+                        ActivityPrintWeb.mPre.setBackgroundResource(R.drawable.bt_left);
                         return false;
                     default:
                         return false;
@@ -358,10 +358,10 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ActivityPrintWeb.mNext.setBackgroundResource(R.C2136drawable.bt_right_hover);
+                        ActivityPrintWeb.mNext.setBackgroundResource(R.drawable.bt_right_hover);
                         return false;
                     case 1:
-                        ActivityPrintWeb.mNext.setBackgroundResource(R.C2136drawable.bt_right_1);
+                        ActivityPrintWeb.mNext.setBackgroundResource(R.drawable.bt_right_1);
                         return false;
                     default:
                         return false;

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

@@ -21,7 +21,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.MainThread;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -1224,7 +1224,7 @@ public class ActivityViewImageSelect extends ActivityIACommon implements View.On
     protected void updateScreen() {
         if (this.imageList.size() < 30) {
             addButton.setEnabled(true);
-            addButton.setImageResource(R.C2136drawable.plus);
+            addButton.setImageResource(R.drawable.plus);
         }
         if (this.imageList.size() > 0) {
             TextView textView = pageTextView;

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -457,31 +457,9 @@ public class EPPrinterManager {
         ePPrinterManager.commitRemotePrinterInfo();
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:3:0x0013  */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
+
     public static boolean checkV3RemotePrinterData(Context r2) {
-        /*
-            epson.print.EPPrinterManager r0 = new epson.print.EPPrinterManager
-            r0.<init>(r2)
-            java.util.ArrayList r2 = r0.getRemotePrinterList()
-            java.util.Iterator r2 = r2.iterator()
-        L_0x000d:
-            boolean r0 = r2.hasNext()
-            if (r0 == 0) goto L_0x0027
-            java.lang.Object r0 = r2.next()
-            epson.print.EPPrinterInfo r0 = (epson.print.EPPrinterInfo) r0
-            java.lang.String r1 = r0.userDefName
-            if (r1 == 0) goto L_0x0025
-            java.lang.String r0 = r0.userDefName
-            int r0 = r0.length()
-            if (r0 > 0) goto L_0x000d
-        L_0x0025:
-            r2 = 1
-            return r2
-        L_0x0027:
-            r2 = 0
-            return r2
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.print.EPPrinterManager.checkV3RemotePrinterData(android.content.Context):boolean");
     }
 }

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

@@ -68,7 +68,7 @@ public class GalleryAdapter extends BaseAdapter {
             imageView.setScaleType(ImageView.ScaleType.CENTER);
             float f = mDensity;
             imageView.setLayoutParams(new Gallery.LayoutParams((f * 96.0f), (f * 96.0f)));
-            imageView.setBackground(mContext.getResources().getDrawable(R.C2136drawable.background_gallary));
+            imageView.setBackground(mContext.getResources().getDrawable(R.drawable.background_gallary));
             imageView.setAdjustViewBounds(true);
             imageView.setFocusable(true);
             imageView.setPadding(10, 10, 10, 10);
@@ -82,7 +82,7 @@ public class GalleryAdapter extends BaseAdapter {
                     if (createThumbnailBitmap != null) {
                         imageView.setImageBitmap(createThumbnailBitmap);
                     } else {
-                        imageView.setImageResource(R.C2136drawable.icon_android);
+                        imageView.setImageResource(R.drawable.icon_android);
                     }
                 }
             } catch (NullPointerException e) {
@@ -94,7 +94,7 @@ public class GalleryAdapter extends BaseAdapter {
             } catch (OutOfMemoryError e2) {
                 EPLog.m316v("err exeption", "line 240 <> EPImageList");
                 e2.printStackTrace();
-                imageView.setImageResource(R.C2136drawable.icon_android);
+                imageView.setImageResource(R.drawable.icon_android);
             }
         }
         return imageView;

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

@@ -63,7 +63,7 @@ public class IconifiedTextListAdapter extends BaseAdapter {
         ((ImageView) view.findViewById(R.id.file_folder_icon)).setImageDrawable(mItems.get(i).getIcon());
         ImageView imageView = (ImageView) view.findViewById(R.id.browse_folder);
         if (mItems.get(i).ismIsFolder()) {
-            imageView.setImageDrawable(mContext.getResources().getDrawable(R.C2136drawable.more));
+            imageView.setImageDrawable(mContext.getResources().getDrawable(R.drawable.more));
         } else {
             imageView.setImageDrawable((Drawable) null);
         }

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

@@ -1,5 +1,6 @@
 package epson.print;
 
+import androidx.multidex.BuildConfig;
 import androidx.multidex.MultiDexApplication;
 
 import com.epson.mobilephone.common.EpLog;
@@ -31,10 +32,16 @@ public class IprintApplication extends MultiDexApplication {
         EpLog.setDebuggable(false);
     }
 
+    /**
+     * @return
+     */
     public static boolean isConnectStaging() {
         return BuildConfig.FLAVOR.equals(STAGE_BETA) || BuildConfig.FLAVOR.equals(STAGE_FFE);
     }
 
+    /**
+     * @return
+     */
     public static boolean isReleaseUnlimited() {
         return BuildConfig.FLAVOR.equals(STAGE_FFE);
     }

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

@@ -26,6 +26,8 @@ import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.epson.iprint.prtlogger.Analytics;
 import com.epson.memcardacc.DirectorySelecterActivity;
 import com.epson.mobilephone.common.EpLog;
@@ -65,6 +67,7 @@ import epson.support.SupportActivity;
  * 主页
  */
 public class IprintHome extends ActivityIACommon implements CommonDefine {
+    
     private static final int EPS_COMM_BID = 2;
     private static final int EPS_ERR_PRINTER_NOT_FOUND = -1300;
     private static final int EPS_PRB_BYID = 1;
@@ -86,80 +89,83 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     boolean finishProbe;
     private boolean mActivityForeground;
     private ArrayList<Runnable> mForegroundRunnableList;
+    
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            EPLog.m313i(IprintHome.TAG, "HandlerCallback");
+            
+            EPLog.m313i(TAG, "HandlerCallback");
+            
             switch (message.what) {
                 case 0:
-                    EPLog.m313i(IprintHome.TAG, "PROBE_PRINTER");
+                    EPLog.m313i(TAG, "PROBE_PRINTER");
                     IprintHome iprintHome = IprintHome.this;
-                    iprintHome.finishProbe = false;
-                    if (iprintHome.task == null) {
+                    finishProbe = false;
+                    if (task == null) {
                         IprintHome iprintHome2 = IprintHome.this;
                         iprintHome2.task = new ProbePrinter();
-                        IprintHome.this.task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
-                        IprintHome.mHandler.sendEmptyMessage(1);
+                        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+                        mHandler.sendEmptyMessage(1);
                         break;
                     }
                     break;
                 case 1:
-                    EPLog.m313i(IprintHome.TAG, "UPDATE_PRINTER_STATUS");
-                    int[] unused = IprintHome.mPrinterStatus = IprintHome.mPrinter.getMPrinterInfor().getMStatus();
-                    EpLog.m69d("status " + IprintHome.mPrinterStatus);
-                    EpLog.m69d("printerLocation " + IprintHome.this.printerLocation);
-                    EpLog.m69d("finishProbe" + IprintHome.this.finishProbe);
+                    EPLog.m313i(TAG, "UPDATE_PRINTER_STATUS");
+                    int[] unused = mPrinterStatus = mPrinter.getMPrinterInfor().getMStatus();
+                    EpLog.m69d("status " + mPrinterStatus);
+                    EpLog.m69d("printerLocation " + printerLocation);
+                    EpLog.m69d("finishProbe" + finishProbe);
                     String str = "";
-                    if (IprintHome.this.printerLocation == 1 && WiFiDirectManager.getConnectInfo(IprintHome.this.getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) != null) {
-                        str = IprintHome.this.getString(R.string.wifi_direct_status);
-                    } else if (IprintHome.this.printerLocation == 1 || (IprintHome.this.printerLocation == 3 && Utils.isConnectedWifi(IprintHome.this.getApplicationContext()))) {
-                        if (IprintHome.this.finishProbe) {
-                            str = IprintHome.this.getString(R.string.printer_ready);
+                    if (printerLocation == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) != null) {
+                        str = getString(R.string.wifi_direct_status);
+                    } else if (printerLocation == 1 || (printerLocation == 3 && Utils.isConnectedWifi(getApplicationContext()))) {
+                        if (finishProbe) {
+                            str = getString(R.string.printer_ready);
                         }
-                    } else if (IprintHome.this.printerLocation != 2 && (IprintHome.this.printerLocation != 3 || Utils.isConnectedWifi(IprintHome.this.getApplicationContext()))) {
-                        str = IprintHome.this.getString(R.string.not_select_status);
-                    } else if (!Utils.isOnline(IprintHome.this.getApplicationContext())) {
-                        str = IprintHome.this.getString(R.string.cannot_connect);
+                    } else if (printerLocation != 2 && (printerLocation != 3 || Utils.isConnectedWifi(getApplicationContext()))) {
+                        str = getString(R.string.not_select_status);
+                    } else if (!Utils.isOnline(getApplicationContext())) {
+                        str = getString(R.string.cannot_connect);
                     } else {
-                        str = IprintHome.this.getString(R.string.remote_can_connect);
+                        str = getString(R.string.remote_can_connect);
                     }
-                    IprintHome.this.printerStatus.setText(str);
-                    EPLog.m313i(IprintHome.TAG, "Stt title: " + str);
+                    printerStatus.setText(str);
+                    EPLog.m313i(TAG, "Stt title: " + str);
                     break;
                 case 2:
-                    IprintHome.this.printerStatus.setText(IprintHome.this.getString(R.string.comm_error));
-                    EPLog.m313i(IprintHome.TAG, "Stt title: " + IprintHome.this.getString(R.string.comm_error));
+                    printerStatus.setText(getString(R.string.comm_error));
+                    EPLog.m313i(TAG, "Stt title: " + getString(R.string.comm_error));
                     break;
                 case 3:
-                    EPLog.m313i(IprintHome.TAG, "STATUS_ERROR");
+                    EPLog.m313i(TAG, "STATUS_ERROR");
                     int[] intArray = message.getData().getIntArray("STATUS_ERROR");
                     if (intArray == null) {
-                        IprintHome.this.printerStatus.setText(IprintHome.this.getString(R.string.upon_error));
-                        EPLog.m313i(IprintHome.TAG, "Stt titlef: " + IprintHome.this.getString(R.string.upon_error));
+                        printerStatus.setText(getString(R.string.upon_error));
+                        EPLog.m313i(TAG, "Stt titlef: " + getString(R.string.upon_error));
                         break;
                     } else {
-                        EPLog.m313i(IprintHome.TAG, "statusError[0] : " + intArray[0]);
-                        EPLog.m313i(IprintHome.TAG, "statusError[1] : " + intArray[1]);
+                        EPLog.m313i(TAG, "statusError[0] : " + intArray[0]);
+                        EPLog.m313i(TAG, "statusError[1] : " + intArray[1]);
                         if (intArray[0] != 2 && intArray[0] != 1 && intArray[0] != 3) {
                             if (intArray[0] != 4 || (intArray[1] != 102 && intArray[1] != -1300)) {
-                                IprintHome.this.printerStatus.setText(IprintHome.this.getString(R.string.upon_error));
-                                EPLog.m313i(IprintHome.TAG, "Stt title: " + IprintHome.this.getString(R.string.upon_error));
+                                printerStatus.setText(getString(R.string.upon_error));
+                                EPLog.m313i(TAG, "Stt title: " + getString(R.string.upon_error));
                                 break;
                             } else {
-                                IprintHome.this.printerStatus.setText(IprintHome.this.getString(R.string.comm_error));
-                                EPLog.m313i(IprintHome.TAG, "Stt title: " + IprintHome.this.getString(R.string.comm_error));
+                                printerStatus.setText(getString(R.string.comm_error));
+                                EPLog.m313i(TAG, "Stt title: " + getString(R.string.comm_error));
                                 break;
                             }
                         } else {
-                            IprintHome.this.printerStatus.setText(IprintHome.this.getString(R.string.printer_ready));
-                            EPLog.m313i(IprintHome.TAG, "Stt title: " + IprintHome.this.getString(R.string.printer_ready));
+                            printerStatus.setText(getString(R.string.printer_ready));
+                            EPLog.m313i(TAG, "Stt title: " + getString(R.string.printer_ready));
                             break;
                         }
                     }
                     break;
                 default:
-                    EPLog.m313i(IprintHome.TAG, DirectorySelecterActivity.PARAM_DEFAULT_DIR);
-                    IprintHome.this.printerName.setText(IprintHome.this.getString(R.string.printer_not_select));
-                    ((ImageView) IprintHome.this.findViewById(R.id.printer_icon)).setVisibility(View.GONE);
+                    EPLog.m313i(TAG, DirectorySelecterActivity.PARAM_DEFAULT_DIR);
+                    printerName.setText(getString(R.string.printer_not_select));
+                    ((ImageView) findViewById(R.id.printer_icon)).setVisibility(View.GONE);
                     break;
             }
             return true;
@@ -209,10 +215,10 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         mActivityForeground = true;
         findViewById(R.id.home_select_printer).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                Intent intent = new Intent(IprintHome.this, MaintainActivity.class);
+                Intent intent = new Intent(this, MaintainActivity.class);
                 intent.setAction("android.intent.action.VIEW");
-                IprintHome.this.startActivity(intent);
-                Analytics.sendAction(IprintHome.this.getApplicationContext(), Analytics.ACTION_ID_HOME_MAINTAIN);
+                startActivity(intent);
+                Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_HOME_MAINTAIN);
             }
         });
         if (bundle == null) {
@@ -228,12 +234,13 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     private void requestLocationPermission() {
-        if (!this.bRejectLocationPermission && !ActivityRequestLocationPermission.canAccessWiFiInfo(this, 4) && BleWork.isStartBleProcess(this, true)) {
+        if (!bRejectLocationPermission && !ActivityRequestLocationPermission.canAccessWiFiInfo(this, 4) && BleWork.isStartBleProcess(this, true)) {
             ActivityRequestLocationPermission.requestLocationPermission((Activity) this, 2);
         }
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
+        super.onActivityResult(i, i2, intent);
         switch (i) {
             case 1:
                 if (i2 != -1) {
@@ -368,7 +375,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         EpLog.m70d(TAG, "" + printerId + ":" + printerIp + ":" + printerLocation + ":" + printerSerial + ":" + deviceID);
         updatePrinterIcon();
         updateMenu();
-        if (!(this.printerLocation == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) == null) && (this.printerLocation != 3 || !Utils.isConnectedWifi(getApplicationContext()))) {
+        if (!(printerLocation == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) == null) && (printerLocation != 3 || !Utils.isConnectedWifi(getApplicationContext()))) {
             EpLog.m70d(TAG, "########################");
             mHandler.sendEmptyMessage(1);
             return;
@@ -378,20 +385,20 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     private void updatePrinterIcon() {
-        if (this.printerName.getText().equals(getString(R.string.printer_not_select))) {
+        if (printerName.getText().equals(getString(R.string.printer_not_select))) {
             ((ImageView) findViewById(R.id.printer_icon)).setVisibility(View.GONE);
             return;
         }
         ((ImageView) findViewById(R.id.printer_icon)).setVisibility(View.VISIBLE);
-        switch (this.printerLocation) {
+        switch (printerLocation) {
             case 1:
-                ((ImageView) findViewById(R.id.printer_icon)).setImageResource(R.C2136drawable.print_local);
+                ((ImageView) findViewById(R.id.printer_icon)).setImageResource(R.drawable.print_local);
                 return;
             case 2:
-                ((ImageView) findViewById(R.id.printer_icon)).setImageResource(R.C2136drawable.print_remote);
+                ((ImageView) findViewById(R.id.printer_icon)).setImageResource(R.drawable.print_remote);
                 return;
             case 3:
-                ((ImageView) findViewById(R.id.printer_icon)).setImageResource(R.C2136drawable.print_ip);
+                ((ImageView) findViewById(R.id.printer_icon)).setImageResource(R.drawable.print_ip);
                 return;
             default:
                 return;
@@ -403,57 +410,57 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         }
 
         protected void onPreExecute() {
-            EPLog.m313i(IprintHome.TAG, "ProbePrinter onPreExecute");
-            IprintHome.this.printerStatus.setText("");
+            EPLog.m313i(TAG, "ProbePrinter onPreExecute");
+            printerStatus.setText("");
         }
 
         protected Boolean doInBackground(Void... voidArr) {
-            EPLog.m313i(IprintHome.TAG, "ProbePrinter doInBackground");
-            IprintHome.mPrinter.doInitDriver(IprintHome.this, 2);
-            if (IprintHome.this.printerLocation == 1 || IprintHome.this.printerLocation == 3) {
-                if (IprintHome.this.printerId != null) {
-                    int doProbePrinter = IprintHome.mPrinter.doProbePrinter(60, IprintHome.this.printerId, IprintHome.this.printerIp, IprintHome.this.printerLocation);
+            EPLog.m313i(TAG, "ProbePrinter doInBackground");
+            mPrinter.doInitDriver(this, 2);
+            if (printerLocation == 1 || printerLocation == 3) {
+                if (printerId != null) {
+                    int doProbePrinter = mPrinter.doProbePrinter(60, printerId, printerIp, printerLocation);
                     while (doProbePrinter != 0) {
                         try {
                             if (isCancelled()) {
                                 break;
                             }
-                            IprintHome.mHandler.sendEmptyMessage(2);
+                            mHandler.sendEmptyMessage(2);
                             Thread.sleep(10000);
-                            doProbePrinter = IprintHome.mPrinter.doProbePrinter(60, IprintHome.this.printerId, IprintHome.this.printerIp, IprintHome.this.printerLocation);
+                            doProbePrinter = mPrinter.doProbePrinter(60, printerId, printerIp, printerLocation);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                             return false;
                         }
                     }
-                    IprintHome.this.finishProbe = true;
+                    finishProbe = true;
                     if (isCancelled()) {
-                        EPLog.m313i(IprintHome.TAG, "Cancelled ProbePrinter");
+                        EPLog.m313i(TAG, "Cancelled ProbePrinter");
                         return false;
                     }
-                    int doSetPrinter = IprintHome.mPrinter.doSetPrinter();
-                    EPLog.m313i(IprintHome.TAG, "Set Printer result: " + doSetPrinter);
+                    int doSetPrinter = mPrinter.doSetPrinter();
+                    EPLog.m313i(TAG, "Set Printer result: " + doSetPrinter);
                     if (doSetPrinter != 0) {
-                        IprintHome.mHandler.sendEmptyMessage(2);
+                        mHandler.sendEmptyMessage(2);
                         return false;
                     }
                     while (!isCancelled()) {
                         try {
-                            int doGetStatus = IprintHome.mPrinter.doGetStatus();
-                            EPLog.m313i(IprintHome.TAG, "Printer Status result: " + doGetStatus);
+                            int doGetStatus = mPrinter.doGetStatus();
+                            EPLog.m313i(TAG, "Printer Status result: " + doGetStatus);
                             if (doGetStatus != 0) {
-                                IprintHome.mHandler.sendEmptyMessage(2);
+                                mHandler.sendEmptyMessage(2);
                             } else {
-                                int[] unused = IprintHome.mPrinterStatus = IprintHome.mPrinter.getMPrinterInfor().getMStatus();
-                                if (IprintHome.mPrinterStatus[0] != 0) {
+                                int[] unused = mPrinterStatus = mPrinter.getMPrinterInfor().getMStatus();
+                                if (mPrinterStatus[0] != 0) {
                                     Message message = new Message();
                                     message.what = 3;
                                     Bundle bundle = new Bundle();
-                                    bundle.putIntArray("STATUS_ERROR", IprintHome.mPrinterStatus);
+                                    bundle.putIntArray("STATUS_ERROR", mPrinterStatus);
                                     message.setData(bundle);
-                                    IprintHome.mHandler.sendMessage(message);
+                                    mHandler.sendMessage(message);
                                 } else {
-                                    IprintHome.mHandler.sendEmptyMessage(1);
+                                    mHandler.sendEmptyMessage(1);
                                 }
                             }
                             Thread.sleep(10000);
@@ -462,25 +469,25 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                             e2.printStackTrace();
                         }
                     }
-                    EPLog.m313i(IprintHome.TAG, "task Cancelled");
+                    EPLog.m313i(TAG, "task Cancelled");
                 } else {
-                    int unused2 = IprintHome.this.printerLocation = 0;
+                    int unused2 = printerLocation = 0;
                 }
             }
             return true;
         }
 
         public boolean cancelTask(boolean z) {
-            EPLog.m313i(IprintHome.TAG, "ProbePrinter cancelTask IN");
-            IprintHome.mPrinter.doCancelFindPrinter();
-            EPLog.m313i(IprintHome.TAG, "ProbePrinter cancelTask OUT");
+            EPLog.m313i(TAG, "ProbePrinter cancelTask IN");
+            mPrinter.doCancelFindPrinter();
+            EPLog.m313i(TAG, "ProbePrinter cancelTask OUT");
             return cancel(z);
         }
 
         protected void onPostExecute(Boolean bool) {
-            EPLog.m313i(IprintHome.TAG, "ProbePrinter onPostExecute");
+            EPLog.m313i(TAG, "ProbePrinter onPostExecute");
             if (bool.booleanValue()) {
-                IprintHome.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             }
         }
     }
@@ -507,11 +514,11 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                     return;
                 }
                 if (!iconTextArrayItem.showMenu) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(IprintHome.this);
+                    AlertDialog.Builder builder = new AlertDialog.Builder(this);
                     builder.setTitle(iconTextArrayItem.menuId);
-                    if (IprintHome.this.printerLocation == 3) {
+                    if (printerLocation == 3) {
                         builder.setMessage(R.string.CannotIPMes);
-                    } else if (IprintHome.this.printerLocation == 2) {
+                    } else if (printerLocation == 2) {
                         builder.setMessage(R.string.CannotRemoteMes);
                     } else {
                         return;
@@ -521,41 +528,41 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                         }
                     });
                     builder.show();
-                } else if (IprintHome.this.getString(iconTextArrayItem.menuId).equalsIgnoreCase(IprintHome.this.getString(R.string.support_buy_ink))) {
-                    IprintHome.this.getBuyInkTask().execute(new Void[0]);
-                    Analytics.sendAction(IprintHome.this.getApplicationContext(), Analytics.ACTION_ID_HOME_BUY_INK);
+                } else if (getString(iconTextArrayItem.menuId).equalsIgnoreCase(getString(R.string.support_buy_ink))) {
+                    getBuyInkTask().execute(new Void[0]);
+                    Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_HOME_BUY_INK);
                 } else if (iconTextArrayItem.menuId == R.string.ready_ink_button_name) {
-                    Analytics.sendAction(IprintHome.this.getApplicationContext(), Analytics.ACTION_ID_HOME_READY_INK);
-                    IprintHome.this.openReadyInkPage();
+                    Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_HOME_READY_INK);
+                    openReadyInkPage();
                 } else {
-                    if (IprintHome.this.getString(iconTextArrayItem.menuId).equalsIgnoreCase(IprintHome.this.getString(R.string.FunctionName_iPrint_MoreApps))) {
+                    if (getString(iconTextArrayItem.menuId).equalsIgnoreCase(getString(R.string.FunctionName_iPrint_MoreApps))) {
                         intent.setAction("android.intent.action.VIEW");
-                        intent.setData(Uri.parse(IprintHome.MORE_APP_URL));
-                        IprintHome.mIprintHomeLogging.countupMoreApp(IprintHome.this);
+                        intent.setData(Uri.parse(MORE_APP_URL));
+                        mIprintHomeLogging.countupMoreApp(this);
                     } else if (!iconTextArrayItem.ClassName.equalsIgnoreCase("")) {
                         if (!iconTextArrayItem.appId.equals("Creative") && !iconTextArrayItem.appId.equalsIgnoreCase("3DFramePrint") && !iconTextArrayItem.appId.equalsIgnoreCase("CameraCopy") && !iconTextArrayItem.appId.equalsIgnoreCase("MultiRollPrint") && !iconTextArrayItem.appId.equalsIgnoreCase("CardPrint") && !iconTextArrayItem.appId.equalsIgnoreCase("Nenga")) {
                             intent.setClassName(iconTextArrayItem.PackageName, iconTextArrayItem.ClassName);
-                            IprintHome.mIprintHomeLogging.sendUiTapData(IprintHome.this.getApplicationContext(), iconTextArrayItem.ClassName);
+                            mIprintHomeLogging.sendUiTapData(getApplicationContext(), iconTextArrayItem.ClassName);
                         } else if (iconTextArrayItem.isInstall) {
                             intent.setAction(iconTextArrayItem.ClassName);
                             intent.setFlags(270532608);
-                            intent.putExtra(Constants.PRINTER_ID, IprintHome.this.printerId);
-                            intent.putExtra(Constants.PRINTER_IP, IprintHome.this.printerIp);
-                            intent.putExtra(Constants.PRINTER_NAME, IprintHome.this.deviceID);
-                            intent.putExtra("PRINTER_SERIAL", IprintHome.this.printerSerial);
+                            intent.putExtra(Constants.PRINTER_ID, printerId);
+                            intent.putExtra(Constants.PRINTER_IP, printerIp);
+                            intent.putExtra(Constants.PRINTER_NAME, deviceID);
+                            intent.putExtra("PRINTER_SERIAL", printerSerial);
                             intent.putExtra("Function", iconTextArrayItem.key);
-                            intent.putExtra("PRINTER_SSID", WiFiDirectManager.getConnectInfo(IprintHome.this.getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER));
-                            IprintHome.mIprintHomeLogging.countUpInstalledOtherApps(IprintHome.this, iconTextArrayItem);
+                            intent.putExtra("PRINTER_SSID", WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER));
+                            mIprintHomeLogging.countUpInstalledOtherApps(this, iconTextArrayItem);
                         } else {
                             intent.setAction("android.intent.action.VIEW");
                             intent.setData(Uri.parse(iconTextArrayItem.googleStoreUrl));
-                            IprintHome.mIprintHomeLogging.countUpNotInstalledOtherApps(IprintHome.this, iconTextArrayItem);
+                            mIprintHomeLogging.countUpNotInstalledOtherApps(this, iconTextArrayItem);
                         }
                     }
                     try {
-                        IprintHome.this.startActivity(intent);
+                        startActivity(intent);
                     } catch (ActivityNotFoundException unused) {
-                        Toast.makeText(IprintHome.this, R.string.upon_error, 0).show();
+                        Toast.makeText(this, R.string.upon_error, 0).show();
                     }
                 }
             }
@@ -568,10 +575,10 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         menudataAdapter.setContext(getApplicationContext());
         menudataAdapter.parseJSONFile();
         String str = deviceID;
-        if (str == null || str.length() < 4 || MyPrinter.PRINTER_USB.equals(this.printerIp)) {
+        if (str == null || str.length() < 4 || MyPrinter.PRINTER_USB.equals(printerIp)) {
             deviceID = "DEFAULT";
         }
-        ArrayList<IconTextArrayItem> MenuListfordeviceID = menudataAdapter.MenuListfordeviceID(this.deviceID, printerLocation, this);
+        ArrayList<IconTextArrayItem> MenuListfordeviceID = menudataAdapter.MenuListfordeviceID(deviceID, printerLocation, this);
         int i = 0;
         if (!isJapaneseDevice()) {
             int i2 = 0;
@@ -592,7 +599,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
             }
             if (MenuListfordeviceID.get(i).appId.equalsIgnoreCase("Nenga")) {
                 MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
-                if (curPrinter.getPrinterId() == null || curPrinter.getLang() != 1 || !isJapaneseDevice() || MyPrinter.PRINTER_USB.equals(this.printerIp)) {
+                if (curPrinter.getPrinterId() == null || curPrinter.getLang() != 1 || !isJapaneseDevice() || MyPrinter.PRINTER_USB.equals(printerIp)) {
                     MenuListfordeviceID.remove(i);
                 } else {
                     try {
@@ -635,16 +642,16 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     private void addReadyInkToMenuEnd(@NonNull List<IconTextArrayItem> list) {
-        list.add(new IconTextArrayItem(R.C2136drawable.image_ready_ink, R.string.ready_ink_button_name, ""));
+        list.add(new IconTextArrayItem(R.drawable.image_ready_ink, R.string.ready_ink_button_name, ""));
     }
 
     private void addBuyInkToMenu(@NonNull List<IconTextArrayItem> list) {
         IconTextArrayItem iconTextArrayItem;
-        if (this.printerLocation == 0) {
-            iconTextArrayItem = new IconTextArrayItem(R.C2136drawable.image_buyink_disabled, R.string.support_buy_ink, "");
+        if (printerLocation == 0) {
+            iconTextArrayItem = new IconTextArrayItem(R.drawable.image_buyink_disabled, R.string.support_buy_ink, "");
             iconTextArrayItem.showMenu = false;
         } else {
-            iconTextArrayItem = new IconTextArrayItem(R.C2136drawable.image_buyink, R.string.support_buy_ink, "");
+            iconTextArrayItem = new IconTextArrayItem(R.drawable.image_buyink, R.string.support_buy_ink, "");
         }
         list.add(1, iconTextArrayItem);
     }
@@ -654,14 +661,14 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         }
 
         protected void onPreExecute() {
-            if (IprintHome.this.task != null) {
-                IprintHome.this.task.cancelTask(true);
-                IprintHome.this.task = null;
+            if (task != null) {
+                task.cancelTask(true);
+                task = null;
             }
         }
 
         protected Void doInBackground(Void... voidArr) {
-            IprintHome.this.startActivity(new Intent("android.intent.action.VIEW", Uri.parse(BuyInkUrl.urlSupport(IprintHome.this.getApplicationContext(), CommonDefine.URL_INK))));
+            startActivity(new Intent("android.intent.action.VIEW", Uri.parse(BuyInkUrl.urlSupport(getApplicationContext(), CommonDefine.URL_INK))));
             return null;
         }
     }

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

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 
 public class SimpleMessageDialogFragment extends DialogFragment {
     private static final String PARAM_MESSAGE_RESOURCE_ID = "message_id";

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

@@ -4,14 +4,17 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.FragmentActivity;
-import android.support.p003v7.app.AppCompatDialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.FragmentActivity;
+
 public class ThreeButtonDialog extends AppCompatDialogFragment {
     private static final String PARAM_LAYOUT_RESOURCE_ID = "layout_resource_id";
 
@@ -30,7 +33,7 @@ public class ThreeButtonDialog extends AppCompatDialogFragment {
 
     public void onCreate(@Nullable Bundle bundle) {
         super.onCreate(bundle);
-        setStyle(1, 0);
+        setStyle(STYLE_NO_TITLE, 0);
     }
 
     public Dialog onCreateDialog(Bundle bundle) {

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

@@ -6,6 +6,9 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 
 
+/**
+ * 分享页面
+ */
 public class WebShareActivity extends AppCompatActivity implements CustomTitleDialogFragment.Callback {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
@@ -21,9 +24,12 @@ public class WebShareActivity extends AppCompatActivity implements CustomTitleDi
         }
     }
 
+    /**
+     * 打开web页面
+     */
     private void startWebActivity() {
         Intent intent = getIntent();
-        intent.setFlags(335544320);
+        intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
         intent.setClass(this, WebviewActivity.class);
         startActivity(intent);
         finish();

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

@@ -217,7 +217,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             EPLog.m305d(WebviewActivity.TAG, "SSL error: " + sslError);
             if (!WebviewActivity.this.isFinishing()) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(WebviewActivity.this);
-                builder.setIcon(R.C2136drawable.ic_action_warning);
+                builder.setIcon(R.drawable.ic_action_warning);
                 builder.setTitle("SSL error");
                 builder.setMessage(trasrateSslError(sslError.getPrimaryError())).setCancelable(false).setPositiveButton(R.string.str_continue, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
@@ -363,8 +363,8 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                 return false;
             }
         });
-        mImageArray[0] = Integer.valueOf(R.C2136drawable.clear_text);
-        mImageArray[1] = Integer.valueOf(R.C2136drawable.reload);
+        mImageArray[0] = Integer.valueOf(R.drawable.clear_text);
+        mImageArray[1] = Integer.valueOf(R.drawable.reload);
         btnClearUrl = (ImageButton) findViewById(R.id.btn_clear_url);
         setClearButtonAppearance(0);
         btnClearUrl.setOnClickListener(this);
@@ -960,7 +960,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
     private AlertDialog createDialog(final String str) {
         AlertDialog create = new AlertDialog.Builder(this).create();
         create.setCancelable(false);
-        create.setIcon(R.C2136drawable.ic_action_warning);
+        create.setIcon(R.drawable.ic_action_warning);
         create.setTitle(R.string.unknow_error_title);
         create.setMessage(str);
         create.setButton(-1, getString(R.string.str_ok), new DialogInterface.OnClickListener() {

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

@@ -19,32 +19,19 @@ public class WellcomeScreenActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_welcome);
         mContext = this;
-        NewLoggerController.stopLoggerIfNotAgreed(this);
         new Thread() {
             int wait = 0;
 
             public void run() {
-                Intent intent;
                 try {
-                    super.run();
-                    if (EPPrinterManager.checkV3RemotePrinterData(mContext)) {
-                        EPPrinterManager.convertV3RemotePrinter(mContext);
-                    }
-                    while (wait < 1000) {
-                        sleep(100);
-                        wait += 100;
-                    }
-                    intent = new Intent(mContext, IprintHome.class);
-                } catch (Exception unused) {
-                    intent = new Intent(mContext, IprintHome.class);
-                } catch (Throwable th) {
-                    WellcomeScreenActivity wellcomeScreenActivity2 = WellcomeScreenActivity.this;
-                    wellcomeScreenActivity2.startActivity(new Intent(wellcomeScreenActivity2, IprintHome.class));
-                    WellcomeScreenActivity.this.finish();
-                    throw th;
+                    sleep(2000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
                 }
+                Intent intent;
+                intent = new Intent(mContext, IprintHome.class);
                 mContext.startActivity(intent);
-                WellcomeScreenActivity.this.finish();
+                finish();
             }
         }.start();
     }

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

@@ -160,10 +160,10 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                     }
                 };
                 if (!file.isFile()) {
-                    new AlertDialog.Builder(this).setIcon(R.C2136drawable.delete_file).setTitle(getString(R.string.delete_file)).setPositiveButton(getString(R.string.str_no), r0).setNegativeButton(getString(R.string.str_yes), r2).show();
+                    new AlertDialog.Builder(this).setIcon(R.drawable.delete_file).setTitle(getString(R.string.delete_file)).setPositiveButton(getString(R.string.str_no), r0).setNegativeButton(getString(R.string.str_yes), r2).show();
                     break;
                 } else {
-                    new AlertDialog.Builder(this).setIcon(R.C2136drawable.delete_file).setTitle(getString(R.string.delete_file)).setPositiveButton(getString(R.string.str_no), r0).setNegativeButton(getString(R.string.str_yes), r2).show();
+                    new AlertDialog.Builder(this).setIcon(R.drawable.delete_file).setTitle(getString(R.string.delete_file)).setPositiveButton(getString(R.string.str_no), r0).setNegativeButton(getString(R.string.str_yes), r2).show();
                     break;
                 }
             case 2:
@@ -180,7 +180,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                 editText.setText(name);
                 builder.setCancelable(false);
                 builder.setTitle(R.string.str_rename);
-                builder.setIcon(R.C2136drawable.info_image);
+                builder.setIcon(R.drawable.info_image);
                 builder.setView(editText);
                 builder.setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
@@ -281,7 +281,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                 }
             }
         };
-        builder.setTitle("Question").setIcon(R.C2136drawable.new_folder).setView(editText).setTitle(getString(R.string.add_new_folder)).setPositiveButton(R.string.str_ok, r3).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
+        builder.setTitle("Question").setIcon(R.drawable.new_folder).setView(editText).setTitle(getString(R.string.add_new_folder)).setPositiveButton(R.string.str_ok, r3).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 Log.v("NamVH", "Cant make the new file");
             }
@@ -446,7 +446,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
             Log.v("compare", "not equals");
             Log.v("getparent currentDirectory", currentDirectory.getParent());
             directoryEntries.add(0, "..");
-            directotyEntries_new_v2.add(0, new IconifiedText("..", getResources().getDrawable(R.C2136drawable.parent_folder), true));
+            directotyEntries_new_v2.add(0, new IconifiedText("..", getResources().getDrawable(R.drawable.parent_folder), true));
         }
         IconifiedTextListAdapter iconifiedTextListAdapter = new IconifiedTextListAdapter(this);
         iconifiedTextListAdapter.setListItems(this.directotyEntries_new_v2);
@@ -487,20 +487,20 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
     private IconifiedText createIcon(String str) {
         File file = new File(str);
         if (file.isDirectory()) {
-            return new IconifiedText(file.getName(), getResources().getDrawable(R.C2136drawable.folder), true);
+            return new IconifiedText(file.getName(), getResources().getDrawable(R.drawable.folder), true);
         }
         if (Photo.IsFilePhoto(str)) {
-            return new IconifiedText(file.getName(), getResources().getDrawable(R.C2136drawable.image), false);
+            return new IconifiedText(file.getName(), getResources().getDrawable(R.drawable.image), false);
         }
         if (Utils.isGConvertFile(str) || isFilePdf(str) || isFileText(str)) {
-            return new IconifiedText(file.getName(), getResources().getDrawable(R.C2136drawable.file), false);
+            return new IconifiedText(file.getName(), getResources().getDrawable(R.drawable.file), false);
         }
-        return new IconifiedText(file.getName(), getResources().getDrawable(R.C2136drawable.icon), false);
+        return new IconifiedText(file.getName(), getResources().getDrawable(R.drawable.icon), false);
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        menu.add(0, 1, 0, getString(R.string.new_folder)).setIcon(R.C2136drawable.new_folder).setShortcut('0', 'f');
+        menu.add(0, 1, 0, getString(R.string.new_folder)).setIcon(R.drawable.new_folder).setShortcut('0', 'f');
         return true;
     }
 

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

@@ -3,9 +3,14 @@ package epson.print.storage;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+import epson.print.R;
+
 
 public class ConfirmCancelDialog extends DialogFragment {
     private static final String PARAM_MESSAGE_RESOURCE_ID = "message_id";

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

@@ -2,7 +2,7 @@ package epson.print.storage;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentManager;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -12,6 +12,12 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import epson.print.R;
+
 
 public class LocalProgressDialog extends DialogFragment {
     private static final String LOG_TAG = "MyProgress";

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

@@ -4,9 +4,14 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentActivity;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import epson.print.R;
+
 
 public class OneButtonDialogFragment extends DialogFragment {
     private static final String PARAM_DIALOG_ID = "dialog_id";

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

@@ -370,10 +370,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                 switch (storageItem.type) {
                     case DIRECTORY:
                         if (!storageItem.name.equals("..")) {
-                            setViewComponents(view2, storageItem.name, R.C2136drawable.folder, R.C2136drawable.more);
+                            setViewComponents(view2, storageItem.name, R.drawable.folder, R.drawable.more);
                             break;
                         } else {
-                            setViewComponents(view2, storageItem.name, R.C2136drawable.parent_folder, R.C2136drawable.more);
+                            setViewComponents(view2, storageItem.name, R.drawable.parent_folder, R.drawable.more);
                             break;
                         }
                     case LOADMORE:
@@ -384,10 +384,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                         setViewComponents(view2, str, -12345, -12345);
                         break;
                     case FILE:
-                        setViewComponents(view2, storageItem.name, R.C2136drawable.file, -12345);
+                        setViewComponents(view2, storageItem.name, R.drawable.file, -12345);
                         break;
                     case PHOTO:
-                        setViewComponents(view2, storageItem.name, R.C2136drawable.image, -12345);
+                        setViewComponents(view2, storageItem.name, R.drawable.image, -12345);
                         StorageProcessDownloadActivity.this.getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
                         break;
                 }

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

@@ -5,14 +5,15 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.box.androidsdk.content.requests.BoxRequestsMetadata;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 
+/**
+ * 存储类
+ */
 public class StorageSecureStore {
     static StorageSecureStore mInstance;
     final String COLUMN_KEY = "key";

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

@@ -53,10 +53,10 @@ public class FileListAdapter extends BaseAdapter {
         }
         OnlineFile onlineFile = mDriveFiles.get(i);
         String name = onlineFile.getName();
-        int i3 = R.C2136drawable.file;
+        int i3 = R.drawable.file;
         if (onlineFile.isFolder()) {
-            i3 = onlineFile instanceof ParentFolder ? R.C2136drawable.parent_folder : R.C2136drawable.folder;
-            i2 = R.C2136drawable.more;
+            i3 = onlineFile instanceof ParentFolder ? R.drawable.parent_folder : R.drawable.folder;
+            i2 = R.drawable.more;
         } else {
             i2 = 0;
         }

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

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentManager;
 import android.view.Menu;
@@ -15,6 +15,9 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.epson.iprint.prtlogger.PrintLog;
 import com.epson.iprint.storage.ConfirmCancelDialog;
 import com.epson.iprint.storage.LocalProgressDialog;
@@ -26,6 +29,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 import epson.print.ActivityIACommon;
+import epson.print.R;
 
 
 public class ListAndDownloadActivity extends ActivityIACommon implements ActivityWrapper, GoogleDownloadContract.View, OneButtonDialogFragment.DialogCallback, ConfirmCancelDialog.DialogCancelListener {

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

@@ -98,7 +98,7 @@ public class I2DoubleSideScanSettingActivity extends ActivityIACommon {
     }
 
     private ModeListAdapter getTurnDirectionAdapter() {
-        return new ModeListAdapter(this, (int[]) null, new int[]{R.C2136drawable.scan_counter_direction, R.C2136drawable.scan_same_direction}, 0);
+        return new ModeListAdapter(this, (int[]) null, new int[]{R.drawable.scan_counter_direction, R.drawable.scan_same_direction}, 0);
     }
 
     public void onBackPressed() {

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

@@ -92,19 +92,19 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
         mProgressViewGroup = findViewById(R.id.llScanningProgress);
         mScanProgressText = (TextView) findViewById(R.id.scanProgressText);
         mPageDisplayText = (TextView) findViewById(R.id.tvScanResult);
-        mSaveButton = new CustomButtonWrapper((Button) findViewById(R.id.btnSave), R.C2136drawable.scan_save);
+        mSaveButton = new CustomButtonWrapper((Button) findViewById(R.id.btnSave), R.drawable.scan_save);
         mSaveButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 I2ScanActivity.this.onSaveButtonClicked();
             }
         });
-        mMailButton = new CustomButtonWrapper((Button) findViewById(R.id.btnMail), R.C2136drawable.scan_mail);
+        mMailButton = new CustomButtonWrapper((Button) findViewById(R.id.btnMail), R.drawable.scan_mail);
         mMailButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 I2ScanActivity.this.startMailActivity();
             }
         });
-        mPrintButton = new CustomButtonWrapper((Button) findViewById(R.id.btnPrint), R.C2136drawable.scan_print);
+        mPrintButton = new CustomButtonWrapper((Button) findViewById(R.id.btnPrint), R.drawable.scan_print);
         mPrintButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 I2ScanActivity.this.startPrintActivity();

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

@@ -133,7 +133,7 @@ public class I2ScanAreaView extends View {
         mScanAreaCornerLengthPixel = Math.round(30.0f * f);
         mScanAreaCornerWidthPixel = Math.round(4.0f * f);
         mScanAreaCornerLogTapAreaWidthPixel = Math.round(60.0f * f);
-        mScanAreaCenterBitmap = BitmapFactory.decodeResource(getResources(), R.C2136drawable.area_center);
+        mScanAreaCenterBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.area_center);
         mDashInterval = new float[]{10.0f * f, 2.0f * f};
         mDisplayDensity = f;
         mScanAreaModified = false;

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

@@ -171,9 +171,9 @@ public class I2ScanSettingActivity extends ActivityIACommon implements View.OnCl
             return;
         }
         mPrinterLocationIcon.setVisibility(View.VISIBLE);
-        int i = R.C2136drawable.print_local;
+        int i = R.drawable.print_local;
         if (mScannerPropertyWrapper.getLocation() == 3) {
-            i = R.C2136drawable.print_ip;
+            i = R.drawable.print_ip;
         }
         mPrinterLocationIcon.setImageResource(i);
     }

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

@@ -42,12 +42,12 @@ public class InputUnitSettingActivity extends ActivityIACommon {
             int unused = InputUnitSettingActivity.this.lastAdfGuide = i;
             switch (i) {
                 case 0:
-                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
-                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)));
+                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
                     break;
                 case 1:
-                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)));
-                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
+                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
+                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
                     break;
             }
             InputUnitSettingActivity.mlAdapter.notifyDataSetChanged();
@@ -78,12 +78,12 @@ public class InputUnitSettingActivity extends ActivityIACommon {
         ArrayList arrayList = new ArrayList();
         switch (this.lastAdfGuide) {
             case 0:
-                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
-                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)));
+                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
                 break;
             case 1:
-                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)));
-                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
+                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
+                arrayList.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
                 break;
         }
         mlAdapter = new CustomListRowAdapter(this, R.layout.com_customline_row, arrayList);

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

@@ -926,10 +926,10 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ScanActivity.this.btnNext.setBackgroundResource(R.C2136drawable.bt_right_hover);
+                        ScanActivity.this.btnNext.setBackgroundResource(R.drawable.bt_right_hover);
                         return false;
                     case 1:
-                        ScanActivity.this.btnNext.setBackgroundResource(R.C2136drawable.bt_right_1);
+                        ScanActivity.this.btnNext.setBackgroundResource(R.drawable.bt_right_1);
                         return false;
                     default:
                         return false;
@@ -942,10 +942,10 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction()) {
                     case 0:
-                        ScanActivity.this.btnPrev.setBackgroundResource(R.C2136drawable.bt_left_hover);
+                        ScanActivity.this.btnPrev.setBackgroundResource(R.drawable.bt_left_hover);
                         return false;
                     case 1:
-                        ScanActivity.this.btnPrev.setBackgroundResource(R.C2136drawable.bt_left);
+                        ScanActivity.this.btnPrev.setBackgroundResource(R.drawable.bt_left);
                         return false;
                     default:
                         return false;
@@ -1653,21 +1653,21 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     }
 
     private void disableFunctionButtons() {
-        CustomButtonWrapper.setScanButtonState(this.btnSave, R.C2136drawable.scan_save, R.string.str_save, false);
-        CustomButtonWrapper.setScanButtonState(this.btnMail, R.C2136drawable.scan_mail, R.string.str_btn_mail, false);
-        CustomButtonWrapper.setScanButtonState(this.btnPrint, R.C2136drawable.scan_print, R.string.str_print, false);
+        CustomButtonWrapper.setScanButtonState(this.btnSave, R.drawable.scan_save, R.string.str_save, false);
+        CustomButtonWrapper.setScanButtonState(this.btnMail, R.drawable.scan_mail, R.string.str_btn_mail, false);
+        CustomButtonWrapper.setScanButtonState(this.btnPrint, R.drawable.scan_print, R.string.str_print, false);
     }
 
     private void enableFunctionButtons() {
-        CustomButtonWrapper.setScanButtonState(this.btnSave, R.C2136drawable.scan_save, R.string.str_save, true);
-        CustomButtonWrapper.setScanButtonState(this.btnMail, R.C2136drawable.scan_mail, R.string.str_btn_mail, true);
-        CustomButtonWrapper.setScanButtonState(this.btnPrint, R.C2136drawable.scan_print, R.string.str_print, true);
+        CustomButtonWrapper.setScanButtonState(this.btnSave, R.drawable.scan_save, R.string.str_save, true);
+        CustomButtonWrapper.setScanButtonState(this.btnMail, R.drawable.scan_mail, R.string.str_btn_mail, true);
+        CustomButtonWrapper.setScanButtonState(this.btnPrint, R.drawable.scan_print, R.string.str_print, true);
     }
 
     private void confirmationDialog(String str) {
         if (!this.isConfirmCancel) {
             confirmAlertDialog = new AlertDialog.Builder(this.context).create();
-            confirmAlertDialog.setIcon(R.C2136drawable.ic_action_warning);
+            confirmAlertDialog.setIcon(R.drawable.ic_action_warning);
             confirmAlertDialog.setCancelable(false);
             confirmAlertDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
                 public boolean onKey(DialogInterface dialogInterface, int i, KeyEvent keyEvent) {

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

@@ -575,7 +575,7 @@ public class ScanBaseView extends ActivityIACommon {
                 String localClassName = ScanBaseView.this.getLocalClassName();
                 EPLog.m313i(localClassName, "mWhere = " + ScanBaseView.mWhere);
                 if (ScanBaseView.mWhere == 0 && ScanBaseView.this.bmCenter == null) {
-                    ScanBaseView.this.bmCenter = BitmapFactory.decodeResource(getResources(), R.C2136drawable.area_center, ScanBaseView.this._bmOption);
+                    ScanBaseView.this.bmCenter = BitmapFactory.decodeResource(getResources(), R.drawable.area_center, ScanBaseView.this._bmOption);
                 }
                 if (ScanBaseView.this.bmCenter != null) {
                     if (this._pBaseCenter == null) {

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

@@ -10,7 +10,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.UiThread;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
@@ -205,10 +205,10 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         mTextDetail = (TextView) mLayout.findViewById(R.id.detail);
         mTextDetail.setVisibility(View.VISIBLE);
         findViewById(R.id.btn_remote).setVisibility(View.GONE);
-        mIpButton.setBackground(getResources().getDrawable(R.C2136drawable.printer_selector_background_remote));
+        mIpButton.setBackground(getResources().getDrawable(R.drawable.printer_selector_background_remote));
         mLayout.findViewById(R.id.ble_wifi_setting).setVisibility(View.GONE);
-        Utils.setDrawble2TextView(this, mLocalButton, R.C2136drawable.printer_selector_icon_local);
-        Utils.setDrawble2TextView(this, mIpButton, R.C2136drawable.printer_selector_icon_ip);
+        Utils.setDrawble2TextView(this, mLocalButton, R.drawable.printer_selector_icon_local);
+        Utils.setDrawble2TextView(this, mIpButton, R.drawable.printer_selector_icon_ip);
         TextView textView = null;
         if (this.scanner_location != 3) {
             mListView.setEmptyView((View) null);
@@ -330,7 +330,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         }
         switch (menuItem.getItemId()) {
             case 1:
-                new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.C2136drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
+                new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         Message obtainMessage = ScanSearchActivity.mHandler.obtainMessage();
                         obtainMessage.what = 9;

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

@@ -227,13 +227,13 @@ public class ScanSettingsActivity extends ActivityIACommon {
         ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
         switch (this.scanInfo.getLocation()) {
             case 1:
-                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_local);
                 return;
             case 2:
-                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_remote);
                 return;
             case 3:
-                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_ip);
                 return;
             default:
                 return;

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

@@ -58,12 +58,12 @@ public class ScanSettingsAdvanceDetailActivity extends ActivityIACommon {
             int unused = ScanSettingsAdvanceDetailActivity.this.lastAdfRotate = i;
             switch (i) {
                 case 0:
-                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.C2136drawable.scan_counter_direction)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
-                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.C2136drawable.scan_same_direction)));
+                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.drawable.scan_counter_direction)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.drawable.scan_same_direction)));
                     break;
                 case 1:
-                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.C2136drawable.scan_counter_direction)));
-                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.C2136drawable.scan_same_direction)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
+                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.drawable.scan_counter_direction)));
+                    ScanSettingsAdvanceDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.drawable.scan_same_direction)).suffixImage(Integer.valueOf(R.drawable.selected)));
                     break;
             }
             ScanSettingsAdvanceDetailActivity.mlAdapter.notifyDataSetChanged();
@@ -102,12 +102,12 @@ public class ScanSettingsAdvanceDetailActivity extends ActivityIACommon {
             lhmListOptionValue.put(getString(R.string.str_no), 0);
             switch (this.lastAdfRotate) {
                 case 0:
-                    items.add(CustomListRowImpl.create().addText(" ").prefixImage(Integer.valueOf(R.C2136drawable.scan_counter_direction)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
-                    items.add(CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.C2136drawable.scan_same_direction)));
+                    items.add(CustomListRowImpl.create().addText(" ").prefixImage(Integer.valueOf(R.drawable.scan_counter_direction)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    items.add(CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.drawable.scan_same_direction)));
                     return;
                 case 1:
-                    items.add(CustomListRowImpl.create().addText(" ").prefixImage(Integer.valueOf(R.C2136drawable.scan_counter_direction)));
-                    items.add(CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.C2136drawable.scan_same_direction)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
+                    items.add(CustomListRowImpl.create().addText(" ").prefixImage(Integer.valueOf(R.drawable.scan_counter_direction)));
+                    items.add(CustomListRowImpl.create().addText("").prefixImage(Integer.valueOf(R.drawable.scan_same_direction)).suffixImage(Integer.valueOf(R.drawable.selected)));
                     return;
                 default:
                     return;

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

@@ -77,12 +77,12 @@ public class ScanSettingsDetailActivity extends ActivityIACommon {
             int unused = ScanSettingsDetailActivity.this.lastAdfGuid = i;
             switch (i) {
                 case 0:
-                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
-                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
                     break;
                 case 1:
-                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)));
-                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
+                    ScanSettingsDetailActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(ScanSettingsDetailActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
                     break;
             }
             ScanSettingsDetailActivity.mlAdapter.notifyDataSetChanged();
@@ -156,12 +156,12 @@ public class ScanSettingsDetailActivity extends ActivityIACommon {
                 }
                 switch (this.lastAdfGuid) {
                     case 0:
-                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
-                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)));
+                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
                         return;
                     case 1:
-                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_left_adst)));
-                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.C2136drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.C2136drawable.selected)));
+                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
+                        items.add(CustomListRowImpl.create().addText(getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
                         return;
                     default:
                         return;

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

@@ -47,7 +47,7 @@ public class ScanSettingsDetailAdapter extends BaseAdapter {
             detailSettingHolder = new DetailSettingHolder();
             detailSettingHolder.text = (TextView) view.findViewById(R.id.tvSettingName);
             detailSettingHolder.img = (ImageView) view.findViewById(R.id.ivSettingSelected);
-            detailSettingHolder.img.setBackgroundResource(R.C2136drawable.selected);
+            detailSettingHolder.img.setBackgroundResource(R.drawable.selected);
             view.setTag(detailSettingHolder);
         } else {
             detailSettingHolder = (DetailSettingHolder) view.getTag();