Browse Source

批量替换

liuyuqi-dellpc 3 years ago
parent
commit
77790fe509
100 changed files with 448 additions and 448 deletions
  1. 1 1
      app/src/main/java/com/epson/cameracopy/alt/FileUtils.java
  2. 3 3
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewActivity.java
  3. 6 6
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java
  4. 9 9
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java
  5. 9 9
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java
  6. 114 114
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java
  7. 63 63
      app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java
  8. 19 19
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeEditActivity.java
  9. 19 19
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java
  10. 5 5
      app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java
  11. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java
  12. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java
  13. 7 7
      app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java
  14. 3 3
      app/src/main/java/com/epson/cameracopy/p006ui/ItemData.java
  15. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/ItemDataAdapter.java
  16. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/MenuControl.java
  17. 3 3
      app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java
  18. 15 15
      app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java
  19. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/SimpleMessageDialogFragment.java
  20. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/AutoManuscriptSize.java
  21. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/DocumentSizeInfo.java
  22. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/IdManuscriptSize.java
  23. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/ImageAndLayout.java
  24. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/ManuscriptSize.java
  25. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java
  26. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/RegistedDocumentSizeList.java
  27. 1 1
      app/src/main/java/com/epson/iprint/prtlogger/AnalyticsPreferences.java
  28. 1 1
      app/src/main/java/com/epson/iprint/prtlogger/CommonLog.java
  29. 1 1
      app/src/main/java/com/epson/iprint/prtlogger/LoggerRecord.java
  30. 1 1
      app/src/main/java/com/epson/lib/escani2/ScanSize.java
  31. 1 1
      app/src/main/java/com/epson/memcardacc/AltAlertDialogFragment.java
  32. 1 1
      app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java
  33. 4 4
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  34. 6 6
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  35. 1 1
      app/src/main/java/com/epson/memcardacc/CopyTask.java
  36. 4 4
      app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java
  37. 1 1
      app/src/main/java/com/epson/memcardacc/FileConvertTask.java
  38. 1 1
      app/src/main/java/com/epson/memcardacc/FileConvertViewModel.java
  39. 4 4
      app/src/main/java/com/epson/memcardacc/ImageFileListAdapter.java
  40. 1 1
      app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java
  41. 3 3
      app/src/main/java/com/epson/memcardacc/LocalProgressDialogFragment.java
  42. 1 1
      app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java
  43. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardDialog.java
  44. 6 6
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  45. 2 2
      app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java
  46. 6 6
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  47. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTempAlertDialog.java
  48. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTempAlertDialogFragment.java
  49. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTop.java
  50. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java
  51. 5 5
      app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java
  52. 6 6
      app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java
  53. 2 2
      app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java
  54. 2 2
      app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java
  55. 1 1
      app/src/main/java/com/epson/mobilephone/common/ReviewInvitationViewModel.java
  56. 1 1
      app/src/main/java/com/epson/mobilephone/common/StoreReview.java
  57. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java
  58. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  59. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  60. 7 7
      app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java
  61. 7 7
      app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java
  62. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java
  63. 2 2
      app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java
  64. 1 1
      app/src/main/java/com/epson/mobilephone/common/license/C1073Util.java
  65. 1 1
      app/src/main/java/com/epson/mobilephone/common/license/DefaultLicenseInfo.java
  66. 1 1
      app/src/main/java/com/epson/mobilephone/common/license/DefaultUserSurveyInfo.java
  67. 2 2
      app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java
  68. 1 1
      app/src/main/java/com/epson/mobilephone/common/license/LicenseInfo.java
  69. 2 2
      app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java
  70. 1 1
      app/src/main/java/com/epson/mobilephone/common/license/SimpleMessageDialogFragment.java
  71. 1 1
      app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInfo.java
  72. 2 2
      app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInvitationActivity.java
  73. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java
  74. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java
  75. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java
  76. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectError.java
  77. 5 5
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java
  78. 4 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectStart.java
  79. 7 7
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java
  80. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java
  81. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/DialogProgressWiFiDirect.java
  82. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiNetworkManager.java
  83. 1 1
      app/src/main/java/epson/colorcorrection/ImageCollect.java
  84. 4 4
      app/src/main/java/epson/common/CustomListRowAdapter.java
  85. 6 6
      app/src/main/java/epson/common/DialogProgress.java
  86. 1 1
      app/src/main/java/epson/common/ExifCopy.java
  87. 1 1
      app/src/main/java/epson/common/ExternalFileUtils.java
  88. 1 1
      app/src/main/java/epson/common/InformationGuide.java
  89. 1 1
      app/src/main/java/epson/common/IprintAppRecord.java
  90. 2 2
      app/src/main/java/epson/common/IprintLicenseInfo.java
  91. 1 1
      app/src/main/java/epson/common/IprintUserSurveyInfo.java
  92. 1 1
      app/src/main/java/epson/common/OsAssistant.java
  93. 2 2
      app/src/main/java/epson/common/ReviewInvitationDialog.java
  94. 1 1
      app/src/main/java/epson/common/ReviewInvitationViewModel.java
  95. 1 1
      app/src/main/java/epson/common/StoreReview.java
  96. 1 1
      app/src/main/java/epson/common/Utils.java
  97. 1 1
      app/src/main/java/epson/common/ble/BleAsyncTask.java
  98. 1 1
      app/src/main/java/epson/common/ble/BleScanWork.java
  99. 1 1
      app/src/main/java/epson/common/ble/BleWork.java
  100. 7 7
      app/src/main/java/epson/common/ble/BleWorkActivity.java

+ 1 - 1
app/src/main/java/com/epson/cameracopy/alt/FileUtils.java

@@ -2,7 +2,7 @@ package com.epson.cameracopy.alt;
 
 import android.content.Context;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+
 import epson.common.ExternalFileUtils;
 import java.io.File;
 

+ 3 - 3
app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewActivity.java

@@ -9,7 +9,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityRequestPermissions;
-import epson.print.C2135R;
+
 
 /* renamed from: com.epson.cameracopy.ui.CameraPreviewActivity */
 public class CameraPreviewActivity extends ActivityIACommon {
@@ -41,7 +41,7 @@ public class CameraPreviewActivity extends ActivityIACommon {
         boolean booleanExtra = getIntent().getBooleanExtra(PARAM_APP_INIT, true);
         CameraPreviewFragment cameraPreviewFragment = new CameraPreviewFragment();
         cameraPreviewFragment.setAppInitFlag(booleanExtra);
-        getSupportFragmentManager().beginTransaction().add((int) R.C2137id.container, (Fragment) cameraPreviewFragment).commit();
+        getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) cameraPreviewFragment).commit();
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -57,7 +57,7 @@ public class CameraPreviewActivity extends ActivityIACommon {
     }
 
     public void onBackPressed() {
-        if (((CameraPreviewFragment) getSupportFragmentManager().findFragmentById(R.C2137id.container)).onBackPressed()) {
+        if (((CameraPreviewFragment) getSupportFragmentManager().findFragmentById(R.id.container)).onBackPressed()) {
             super.onBackPressed();
         }
     }

+ 6 - 6
app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java

@@ -21,7 +21,7 @@ import com.epson.cameracopy.device.CameraFile;
 import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.device.OpenCvCameraView;
 import com.epson.cameracopy.device.RectangleDetector;
-import epson.print.C2135R;
+
 import epson.print.imgsel.CameraCopyImageSelectActivity;
 import java.util.Date;
 import java.util.Iterator;
@@ -96,7 +96,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         View inflate = layoutInflater.inflate(R.layout.fragment_camera_preview, viewGroup, false);
         setHasOptionsMenu(true);
         setButtonListener(inflate);
-        this.mOpenCvCameraView = (OpenCvCameraView) inflate.findViewById(R.C2137id.view1);
+        this.mOpenCvCameraView = (OpenCvCameraView) inflate.findViewById(R.id.view1);
         if (CameraPreviewControl.hasBackCamera()) {
             this.mHasCamera = true;
             this.mOpenCvCameraView.setCvCameraViewListener((CameraBridgeViewBase.CvCameraViewListener2) this);
@@ -113,13 +113,13 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         this.mSensorEventListener.setDisplayRotation(this.mDisplayRotation);
         this.mSensorEventListener.setSensorManager((SensorManager) getActivity().getSystemService("sensor"));
         this.mSensorEventListener.setReferenceAccelaration(REFERENCE_ACCELARATION);
-        this.mFunctionBarView = inflate.findViewById(R.C2137id.function_bar);
+        this.mFunctionBarView = inflate.findViewById(R.id.function_bar);
         this.mDisplayDensity = getActivity().getResources().getDisplayMetrics().density;
         return inflate;
     }
 
     private void setButtonListener(View view) {
-        this.mPhotoSelectButton = (Button) view.findViewById(R.C2137id.photo_select_button);
+        this.mPhotoSelectButton = (Button) view.findViewById(R.id.photo_select_button);
         this.mPhotoSelectButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if (!CameraPreviewFragment.this.mPictureTaking) {
@@ -127,7 +127,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
                 }
             }
         });
-        this.mPhtographButton = (Button) view.findViewById(R.C2137id.photograph_button);
+        this.mPhtographButton = (Button) view.findViewById(R.id.photograph_button);
         this.mPhtographButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if (!CameraPreviewFragment.this.mPictureTaking) {
@@ -510,7 +510,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != R.C2137id.camera_setting) {
+        if (menuItem.getItemId() != R.id.camera_setting) {
             return super.onOptionsItemSelected(menuItem);
         }
         if (this.mPictureTaking) {

+ 9 - 9
app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java

@@ -17,7 +17,7 @@ import android.widget.TextView;
 import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.p006ui.PictureResolutionDialogFragment;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import java.io.File;
 
 /* renamed from: com.epson.cameracopy.ui.CameraPreviewOptionActivity */
@@ -31,7 +31,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
         setActionBar((int) R.string.camera_option_title, true);
         if (bundle == null) {
             this.mFragment = new PlaceholderFragment();
-            getSupportFragmentManager().beginTransaction().add((int) R.C2137id.container, (Fragment) this.mFragment).commit();
+            getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) this.mFragment).commit();
         }
     }
 
@@ -57,29 +57,29 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
             View inflate = layoutInflater.inflate(R.layout.fragment_camera_preview_option, viewGroup, false);
             this.mCameraPreviewControl = CameraPreviewControl.getInstance(getActivity());
             setHasOptionsMenu(true);
-            this.mGuideToggleButton = (Switch) inflate.findViewById(R.C2137id.guideToggleButton);
+            this.mGuideToggleButton = (Switch) inflate.findViewById(R.id.guideToggleButton);
             this.mGuideToggleButton.setChecked(this.mCameraPreviewControl.getGuideMode());
             this.mGuideToggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
                     PlaceholderFragment.this.changeAutoPhotoToggleButtonStatus(z);
                 }
             });
-            this.mAutoPhotoToggleButton = (Switch) inflate.findViewById(R.C2137id.autoPictureToggleButton);
+            this.mAutoPhotoToggleButton = (Switch) inflate.findViewById(R.id.autoPictureToggleButton);
             this.mAutoPhotoToggleButton.setChecked(this.mCameraPreviewControl.getAutoPictureMode());
             changeAutoPhotoToggleButtonStatus(this.mGuideToggleButton.isChecked());
-            ((LinearLayout) inflate.findViewById(R.C2137id.save_directory_layout)).setOnClickListener(new View.OnClickListener() {
+            ((LinearLayout) inflate.findViewById(R.id.save_directory_layout)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     PlaceholderFragment.this.startSaveDirectoryActivity();
                 }
             });
-            this.mSaveDirectoryText = (TextView) inflate.findViewById(R.C2137id.saveDirectoryText);
+            this.mSaveDirectoryText = (TextView) inflate.findViewById(R.id.saveDirectoryText);
             setSaveDirectoryText(this.mCameraPreviewControl.getSaveDirecotry());
-            inflate.findViewById(R.C2137id.picture_resolution_layout).setOnClickListener(new View.OnClickListener() {
+            inflate.findViewById(R.id.picture_resolution_layout).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     PlaceholderFragment.this.openPictureResolutionDialog();
                 }
             });
-            this.mPictureResolutionText = (TextView) inflate.findViewById(R.C2137id.pictureResolutionText);
+            this.mPictureResolutionText = (TextView) inflate.findViewById(R.id.pictureResolutionText);
             setCameraPictureResolutionModeFromCameraPreviewControl();
             setPictureResolutionText();
             return inflate;
@@ -171,7 +171,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
         }
 
         public boolean onOptionsItemSelected(MenuItem menuItem) {
-            if (menuItem.getItemId() != R.C2137id.menuSettingsDone) {
+            if (menuItem.getItemId() != R.id.menuSettingsDone) {
                 return super.onOptionsItemSelected(menuItem);
             }
             changeValueAndFinish();

+ 9 - 9
app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java

@@ -21,7 +21,7 @@ import com.epson.iprint.prtlogger.Analytics;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 import epson.common.Utils;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
@@ -840,12 +840,12 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         this.isRemotePrinter = MyPrinter.isRemotePrinter(this);
         setContentView(R.layout.progress_layout);
         this.context = this;
-        mProgressPercent = (ProgressBar) findViewById(R.C2137id.progress_percent);
-        this.mPercent = (TextView) findViewById(R.C2137id.percent);
-        mProgressCopies = (ProgressBar) findViewById(R.C2137id.progress_copies);
-        this.mCopies = (TextView) findViewById(R.C2137id.copies);
-        this.mPage = (TextView) findViewById(R.C2137id.page);
-        mProgressPage = (ProgressBar) findViewById(R.C2137id.progress_page);
+        mProgressPercent = (ProgressBar) findViewById(R.id.progress_percent);
+        this.mPercent = (TextView) findViewById(R.id.percent);
+        mProgressCopies = (ProgressBar) findViewById(R.id.progress_copies);
+        this.mCopies = (TextView) findViewById(R.id.copies);
+        this.mPage = (TextView) findViewById(R.id.page);
+        mProgressPage = (ProgressBar) findViewById(R.id.progress_page);
         if (this.sheets > 1) {
             TextView textView = this.mPage;
             textView.setText(getString(R.string.page) + ": " + this.curSheet + CommonDefine.SLASH + this.sheets);
@@ -863,7 +863,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             textView2.setText(getString(R.string.copies) + ": " + this.curCopy + CommonDefine.SLASH + copies);
             mProgressCopies.setProgress((this.curCopy * 100) / copies);
         }
-        this.mCancelButton = (Button) findViewById(R.C2137id.cancel_button);
+        this.mCancelButton = (Button) findViewById(R.id.cancel_button);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 CameraPrintProgress.this.CancelPrint();
@@ -878,7 +878,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         TextView textView3 = this.mPercent;
         textView3.setText(this.percentString + "         0%");
         mProgressPercent.setProgress(0);
-        findViewById(R.C2137id.epsonColorImageView).setVisibility(8);
+        findViewById(R.id.epsonColorImageView).setVisibility(8);
         if (this.isRemotePrinter) {
             this.mHandler.sendEmptyMessage(2);
         } else {

+ 114 - 114
app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java

@@ -28,7 +28,7 @@ import epson.common.Constants;
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.EPPrinterManager;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
@@ -1746,31 +1746,31 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
         this.sheets = 1;
         this.mRemoteSrcType = 2;
-        this.printerName = (TextView) findViewById(R.C2137id.printer_name);
-        this.paperSizeInfo = (TextView) findViewById(R.C2137id.paper_size_info);
-        this.paperTypeInfo = (TextView) findViewById(R.C2137id.paper_type_info);
-        this.layoutInfo = (TextView) findViewById(R.C2137id.layout_info);
-        this.qualityInfo = (TextView) findViewById(R.C2137id.quality_info);
-        this.paperSourceInfo = (TextView) findViewById(R.C2137id.paper_source_info);
-        this.copies = (TextView) findViewById(R.C2137id.copies);
-        this.copiesMinus = (Button) findViewById(R.C2137id.copies_minus_button);
-        this.copiesPlus = (Button) findViewById(R.C2137id.copies_plus_button);
+        this.printerName = (TextView) findViewById(R.id.printer_name);
+        this.paperSizeInfo = (TextView) findViewById(R.id.paper_size_info);
+        this.paperTypeInfo = (TextView) findViewById(R.id.paper_type_info);
+        this.layoutInfo = (TextView) findViewById(R.id.layout_info);
+        this.qualityInfo = (TextView) findViewById(R.id.quality_info);
+        this.paperSourceInfo = (TextView) findViewById(R.id.paper_source_info);
+        this.copies = (TextView) findViewById(R.id.copies);
+        this.copiesMinus = (Button) findViewById(R.id.copies_minus_button);
+        this.copiesPlus = (Button) findViewById(R.id.copies_plus_button);
         LongTapRepeatAdapter.bless(this.copiesMinus);
         LongTapRepeatAdapter.bless(this.copiesPlus);
-        this.colorInfo = (TextView) findViewById(R.C2137id.color_info);
-        this.duplexInfo = (TextView) findViewById(R.C2137id.duplex_info);
-        this.feedDirectionInfo = (TextView) findViewById(R.C2137id.feed_direction_info);
-        this.printDateInfo = (TextView) findViewById(R.C2137id.printdate_info);
-        this.brightness = (TextView) findViewById(R.C2137id.brightness);
-        this.brightnessMinus = (Button) findViewById(R.C2137id.brightness_minus_button);
-        this.brightnessPlus = (Button) findViewById(R.C2137id.brightness_plus_button);
-        this.contrast = (TextView) findViewById(R.C2137id.contrast);
-        this.contrastMinus = (Button) findViewById(R.C2137id.contrast_minus_button);
-        this.contrastPlus = (Button) findViewById(R.C2137id.contrast_plus_button);
-        this.saturation = (TextView) findViewById(R.C2137id.saturation);
-        this.saturationMinus = (Button) findViewById(R.C2137id.saturation_minus_button);
-        this.saturationPlus = (Button) findViewById(R.C2137id.saturation_plus_button);
-        this.progressGetOption = findViewById(R.C2137id.progressGetOption);
+        this.colorInfo = (TextView) findViewById(R.id.color_info);
+        this.duplexInfo = (TextView) findViewById(R.id.duplex_info);
+        this.feedDirectionInfo = (TextView) findViewById(R.id.feed_direction_info);
+        this.printDateInfo = (TextView) findViewById(R.id.printdate_info);
+        this.brightness = (TextView) findViewById(R.id.brightness);
+        this.brightnessMinus = (Button) findViewById(R.id.brightness_minus_button);
+        this.brightnessPlus = (Button) findViewById(R.id.brightness_plus_button);
+        this.contrast = (TextView) findViewById(R.id.contrast);
+        this.contrastMinus = (Button) findViewById(R.id.contrast_minus_button);
+        this.contrastPlus = (Button) findViewById(R.id.contrast_plus_button);
+        this.saturation = (TextView) findViewById(R.id.saturation);
+        this.saturationMinus = (Button) findViewById(R.id.saturation_minus_button);
+        this.saturationPlus = (Button) findViewById(R.id.saturation_plus_button);
+        this.progressGetOption = findViewById(R.id.progressGetOption);
         this.enableShowPreview = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_PREVIEW, true);
         loadConfig();
         setClickListener();
@@ -1789,19 +1789,19 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
     private void updatePrinterIcon() {
         if (this.printerName.getText().equals(getString(R.string.str_lbl_title_scan))) {
-            ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setVisibility(8);
+            ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(8);
             return;
         }
-        ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setVisibility(0);
+        ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(0);
         switch (this.printerLocation) {
             case 1:
-                ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
                 return;
             case 2:
-                ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
                 return;
             case 3:
-                ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
                 return;
             default:
                 return;
@@ -1818,18 +1818,18 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.saturationMinus.setOnClickListener(this);
         this.saturationPlus.setOnClickListener(this);
         if (this.isDocumentSetting) {
-            findViewById(R.C2137id.page_range_setting).setOnClickListener(this);
+            findViewById(R.id.page_range_setting).setOnClickListener(this);
         }
-        findViewById(R.C2137id.printer).setOnClickListener(this);
-        findViewById(R.C2137id.paper_size).setOnClickListener(this);
-        findViewById(R.C2137id.paper_type).setOnClickListener(this);
-        findViewById(R.C2137id.layout).setOnClickListener(this);
-        findViewById(R.C2137id.quality).setOnClickListener(this);
-        findViewById(R.C2137id.paper_source).setOnClickListener(this);
-        findViewById(R.C2137id.color).setOnClickListener(this);
-        findViewById(R.C2137id.duplex).setOnClickListener(this);
-        findViewById(R.C2137id.feed_direction).setOnClickListener(this);
-        findViewById(R.C2137id.printdate).setOnClickListener(this);
+        findViewById(R.id.printer).setOnClickListener(this);
+        findViewById(R.id.paper_size).setOnClickListener(this);
+        findViewById(R.id.paper_type).setOnClickListener(this);
+        findViewById(R.id.layout).setOnClickListener(this);
+        findViewById(R.id.quality).setOnClickListener(this);
+        findViewById(R.id.paper_source).setOnClickListener(this);
+        findViewById(R.id.color).setOnClickListener(this);
+        findViewById(R.id.duplex).setOnClickListener(this);
+        findViewById(R.id.feed_direction).setOnClickListener(this);
+        findViewById(R.id.printdate).setOnClickListener(this);
     }
 
     private void loadConfig() {
@@ -1902,7 +1902,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             this.printAll = printSetting.printAll;
             this.startValue = printSetting.startValue;
             this.endValue = printSetting.endValue;
-            ((TextView) findViewById(R.C2137id.page_range_value)).setText(this.startValue + ".." + this.endValue);
+            ((TextView) findViewById(R.id.page_range_value)).setText(this.startValue + ".." + this.endValue);
             return;
         }
         this.mLookupTable = new MediaInfo.PrintDate();
@@ -2111,7 +2111,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                 }
             }
             switch (view.getId()) {
-                case R.C2137id.brightness_minus_button /*2131230848*/:
+                case R.id.brightness_minus_button /*2131230848*/:
                     this.brightnessValue--;
                     if (this.brightnessValue <= -50) {
                         this.brightnessValue = -50;
@@ -2122,7 +2122,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.brightnessPlus.setEnabled(true);
                     this.brightness.setText(String.valueOf(this.brightnessValue));
                     return;
-                case R.C2137id.brightness_plus_button /*2131230850*/:
+                case R.id.brightness_plus_button /*2131230850*/:
                     this.brightnessValue++;
                     if (this.brightnessValue >= 50) {
                         this.brightnessValue = 50;
@@ -2133,10 +2133,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.brightnessMinus.setEnabled(true);
                     this.brightness.setText(String.valueOf(this.brightnessValue));
                     return;
-                case R.C2137id.color /*2131230930*/:
-                    launchDetailScreen(this.color, R.C2137id.color);
+                case R.id.color /*2131230930*/:
+                    launchDetailScreen(this.color, R.id.color);
                     return;
-                case R.C2137id.contrast_minus_button /*2131230942*/:
+                case R.id.contrast_minus_button /*2131230942*/:
                     this.contrastValue--;
                     if (this.contrastValue <= -50) {
                         this.contrastValue = -50;
@@ -2147,7 +2147,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.contrastPlus.setEnabled(true);
                     this.contrast.setText(String.valueOf(this.contrastValue));
                     return;
-                case R.C2137id.contrast_plus_button /*2131230943*/:
+                case R.id.contrast_plus_button /*2131230943*/:
                     this.contrastValue++;
                     if (this.contrastValue >= 50) {
                         this.contrastValue = 50;
@@ -2158,7 +2158,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.contrastMinus.setEnabled(true);
                     this.contrast.setText(String.valueOf(this.contrastValue));
                     return;
-                case R.C2137id.copies_minus_button /*2131230945*/:
+                case R.id.copies_minus_button /*2131230945*/:
                     this.copiesValue--;
                     if (this.copiesValue <= 1) {
                         this.copiesValue = 1;
@@ -2169,7 +2169,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.copiesPlus.setEnabled(true);
                     this.copies.setText(String.valueOf(this.copiesValue));
                     return;
-                case R.C2137id.copies_plus_button /*2131230946*/:
+                case R.id.copies_plus_button /*2131230946*/:
                     this.copiesValue++;
                     if (this.copiesValue >= 30) {
                         this.copiesValue = 30;
@@ -2180,16 +2180,16 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.copiesMinus.setEnabled(true);
                     this.copies.setText(String.valueOf(this.copiesValue));
                     return;
-                case R.C2137id.duplex /*2131231005*/:
-                    launchDetailScreen(this.duplex, R.C2137id.duplex);
+                case R.id.duplex /*2131231005*/:
+                    launchDetailScreen(this.duplex, R.id.duplex);
                     return;
-                case R.C2137id.feed_direction /*2131231037*/:
-                    launchDetailScreen(this.feedDirection, R.C2137id.feed_direction);
+                case R.id.feed_direction /*2131231037*/:
+                    launchDetailScreen(this.feedDirection, R.id.feed_direction);
                     return;
-                case R.C2137id.layout /*2131231158*/:
-                    launchDetailScreen(this.layout, R.C2137id.layout);
+                case R.id.layout /*2131231158*/:
+                    launchDetailScreen(this.layout, R.id.layout);
                     return;
-                case R.C2137id.page_range_setting /*2131231300*/:
+                case R.id.page_range_setting /*2131231300*/:
                     Intent intent = new Intent(this, PageRangeSetting.class);
                     intent.putExtra("SHEETS", this.sheets);
                     intent.putExtra("printAll", this.printAll);
@@ -2197,28 +2197,28 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     intent.putExtra("endValue", this.endValue);
                     startActivityForResult(intent, 2);
                     return;
-                case R.C2137id.paper_size /*2131231306*/:
-                    launchDetailScreen(this.paperSize, R.C2137id.paper_size);
+                case R.id.paper_size /*2131231306*/:
+                    launchDetailScreen(this.paperSize, R.id.paper_size);
                     return;
-                case R.C2137id.paper_source /*2131231311*/:
+                case R.id.paper_source /*2131231311*/:
                     int i = this.paperSource;
                     int[] iArr = this.paper_source_info;
                     if (iArr != null && iArr.length <= 1) {
                         i = 128;
                     }
-                    launchDetailScreen(i, R.C2137id.paper_source);
+                    launchDetailScreen(i, R.id.paper_source);
                     return;
-                case R.C2137id.paper_type /*2131231314*/:
-                    launchDetailScreen(this.paperType, R.C2137id.paper_type);
+                case R.id.paper_type /*2131231314*/:
+                    launchDetailScreen(this.paperType, R.id.paper_type);
                     return;
-                case R.C2137id.printdate /*2131231355*/:
-                    launchDetailScreen(this.printdate, R.C2137id.printdate);
+                case R.id.printdate /*2131231355*/:
+                    launchDetailScreen(this.printdate, R.id.printdate);
                     return;
-                case R.C2137id.printer /*2131231358*/:
+                case R.id.printer /*2131231358*/:
                     unbindEpsonService();
                     new AsyncTask<Void, Void, Void>() {
                         protected void onPreExecute() {
-                            CameraPrintSettingActivity.this.findViewById(R.C2137id.printer).setClickable(false);
+                            CameraPrintSettingActivity.this.findViewById(R.id.printer).setClickable(false);
                         }
 
                         protected Void doInBackground(Void... voidArr) {
@@ -2239,14 +2239,14 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                             bundle.putString(CameraPrintSettingActivity.EXTRA_SIMPLEAP, CameraPrintSettingActivity.this.autoConnectSsid);
                             intent.putExtras(bundle);
                             CameraPrintSettingActivity.this.startActivityForResult(intent, 0);
-                            CameraPrintSettingActivity.this.findViewById(R.C2137id.printer).setClickable(true);
+                            CameraPrintSettingActivity.this.findViewById(R.id.printer).setClickable(true);
                         }
                     }.execute(new Void[0]);
                     return;
-                case R.C2137id.quality /*2131231392*/:
-                    launchDetailScreen(this.quality, R.C2137id.quality);
+                case R.id.quality /*2131231392*/:
+                    launchDetailScreen(this.quality, R.id.quality);
                     return;
-                case R.C2137id.saturation_minus_button /*2131231425*/:
+                case R.id.saturation_minus_button /*2131231425*/:
                     this.saturationValue--;
                     if (this.saturationValue <= -50) {
                         this.saturationValue = -50;
@@ -2257,7 +2257,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.saturationPlus.setEnabled(true);
                     this.saturation.setText(String.valueOf(this.saturationValue));
                     return;
-                case R.C2137id.saturation_plus_button /*2131231426*/:
+                case R.id.saturation_plus_button /*2131231426*/:
                     this.saturationValue++;
                     if (this.saturationValue >= 50) {
                         this.saturationValue = 50;
@@ -2283,26 +2283,26 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         bundle.putInt("curValue", i);
         bundle.putBoolean("isDocumentSetting", this.isDocumentSetting);
         switch (i2) {
-            case R.C2137id.color /*2131230930*/:
+            case R.id.color /*2131230930*/:
                 bundle.putIntArray(Constants.COLOR_INFO, this.color_info);
                 break;
-            case R.C2137id.duplex /*2131231005*/:
+            case R.id.duplex /*2131231005*/:
                 bundle.putIntArray(Constants.DUPLEX_INFO, this.duplex_info);
                 break;
-            case R.C2137id.layout /*2131231158*/:
+            case R.id.layout /*2131231158*/:
                 bundle.putIntArray(Constants.LAYOUT_INFO, this.layout_info);
                 break;
-            case R.C2137id.paper_size /*2131231306*/:
+            case R.id.paper_size /*2131231306*/:
                 bundle.putIntArray(Constants.PAPER_SIZE_INFO, this.paper_size_info);
                 break;
-            case R.C2137id.paper_source /*2131231311*/:
+            case R.id.paper_source /*2131231311*/:
                 int[] iArr = this.paper_source_info;
                 bundle.putIntArray(Constants.PAPER_SOURCE_INFO, (iArr == null || iArr.length > 1) ? this.paper_source_info : new int[]{128});
                 break;
-            case R.C2137id.paper_type /*2131231314*/:
+            case R.id.paper_type /*2131231314*/:
                 bundle.putIntArray(Constants.PAPER_TYPE_INFO, this.paper_type_info);
                 break;
-            case R.C2137id.quality /*2131231392*/:
+            case R.id.quality /*2131231392*/:
                 bundle.putIntArray(Constants.PRINT_QUALITY_INFO, this.quality_info);
                 break;
         }
@@ -2320,25 +2320,25 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     if (i == 1 && i2 == -1) {
                         int i3 = intent.getExtras().getInt("curValue");
                         switch (intent.getExtras().getInt("ID")) {
-                            case R.C2137id.color /*2131230930*/:
+                            case R.id.color /*2131230930*/:
                                 this.mLookupTable = new MediaInfo.Color();
                                 this.colorInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.color = i3;
                                 break;
-                            case R.C2137id.duplex /*2131231005*/:
+                            case R.id.duplex /*2131231005*/:
                                 this.mLookupTable = new MediaInfo.Duplex();
                                 this.duplexInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.duplex = i3;
                                 break;
-                            case R.C2137id.feed_direction /*2131231037*/:
+                            case R.id.feed_direction /*2131231037*/:
                                 this.mLookupTable = new MediaInfo.FeedDirection();
                                 this.feedDirectionInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.feedDirection = i3;
                                 break;
-                            case R.C2137id.layout /*2131231158*/:
+                            case R.id.layout /*2131231158*/:
                                 this.mLookupTable = new MediaInfo.Layout();
                                 this.layoutInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
@@ -2346,7 +2346,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(32);
                                 break;
-                            case R.C2137id.paper_size /*2131231306*/:
+                            case R.id.paper_size /*2131231306*/:
                                 this.sizeIndex = intent.getExtras().getInt("INDEX");
                                 this.mLookupTable = new MediaInfo.PaperSize();
                                 this.paperSizeInfo.setText(getString(this.mLookupTable.getStringId(i3)));
@@ -2356,7 +2356,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(2);
                                 break;
-                            case R.C2137id.paper_source /*2131231311*/:
+                            case R.id.paper_source /*2131231311*/:
                                 this.mLookupTable = new MediaInfo.PaperSource();
                                 this.paperSourceInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
@@ -2367,7 +2367,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(32);
                                 break;
-                            case R.C2137id.paper_type /*2131231314*/:
+                            case R.id.paper_type /*2131231314*/:
                                 this.typeIndex = intent.getExtras().getInt("INDEX");
                                 this.mLookupTable = new MediaInfo.PaperType();
                                 this.paperTypeInfo.setText(getString(this.mLookupTable.getStringId(i3)));
@@ -2377,13 +2377,13 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(3);
                                 break;
-                            case R.C2137id.printdate /*2131231355*/:
+                            case R.id.printdate /*2131231355*/:
                                 this.mLookupTable = new MediaInfo.PrintDate();
                                 this.printDateInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.printdate = i3;
                                 break;
-                            case R.C2137id.quality /*2131231392*/:
+                            case R.id.quality /*2131231392*/:
                                 this.mLookupTable = new MediaInfo.Quality();
                                 this.qualityInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
@@ -2558,30 +2558,30 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         setVisibilityPageRange(false);
         int[] iArr = this.color_info;
         if (iArr == null) {
-            ((ImageView) findViewById(R.C2137id.color_next_screen_imv)).setVisibility(8);
+            ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(8);
         } else if (iArr.length <= 1) {
-            ((ImageView) findViewById(R.C2137id.color_next_screen_imv)).setVisibility(8);
+            ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(8);
         } else {
-            ((ImageView) findViewById(R.C2137id.color_next_screen_imv)).setVisibility(0);
+            ((ImageView) findViewById(R.id.color_next_screen_imv)).setVisibility(0);
         }
         int[] iArr2 = this.duplex_info;
-        findViewById(R.C2137id.duplex_view).setVisibility(8);
-        ((LinearLayout) findViewById(R.C2137id.duplex)).setVisibility(8);
+        findViewById(R.id.duplex_view).setVisibility(8);
+        ((LinearLayout) findViewById(R.id.duplex)).setVisibility(8);
         switch (this.lang) {
             case 2:
             case 3:
-                findViewById(R.C2137id.feed_direction_view).setVisibility(0);
-                findViewById(R.C2137id.feed_direction).setVisibility(0);
+                findViewById(R.id.feed_direction_view).setVisibility(0);
+                findViewById(R.id.feed_direction).setVisibility(0);
                 break;
             default:
-                findViewById(R.C2137id.feed_direction_view).setVisibility(8);
-                findViewById(R.C2137id.feed_direction).setVisibility(8);
+                findViewById(R.id.feed_direction_view).setVisibility(8);
+                findViewById(R.id.feed_direction).setVisibility(8);
                 break;
         }
         if (!this.isDocumentSetting) {
             int i = this.printerLocation;
         }
-        findViewById(R.C2137id.printdate).setVisibility(8);
+        findViewById(R.id.printdate).setVisibility(8);
     }
 
     private int getPrinterLang() {
@@ -2603,8 +2603,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
     private void setVisibilityPageRange(boolean z) {
         int i = 0;
-        findViewById(R.C2137id.page_range_setting).setVisibility(z ? 0 : 8);
-        View findViewById = findViewById(R.C2137id.page_range_separator);
+        findViewById(R.id.page_range_setting).setVisibility(z ? 0 : 8);
+        View findViewById = findViewById(R.id.page_range_separator);
         if (!z) {
             i = 8;
         }
@@ -2612,10 +2612,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     private void setClickablePageRange(boolean z) {
-        findViewById(R.C2137id.page_range_setting).setClickable(z);
+        findViewById(R.id.page_range_setting).setClickable(z);
         int i = 0;
-        findViewById(R.C2137id.page_range_next_screen_imv).setVisibility(z ? 0 : 8);
-        View findViewById = findViewById(R.C2137id.page_range_value);
+        findViewById(R.id.page_range_next_screen_imv).setVisibility(z ? 0 : 8);
+        View findViewById = findViewById(R.id.page_range_value);
         if (!z) {
             i = 8;
         }
@@ -2638,7 +2638,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.duplex_info = null;
         this.autoConnectSsid = "";
         this.printerName.setText(getString(R.string.str_lbl_title_scan));
-        ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setVisibility(8);
+        ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(8);
         updateSettingView();
         setScreenState(true);
     }
@@ -2667,16 +2667,16 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         } else {
             this.progressGetOption.setVisibility(0);
         }
-        findViewById(R.C2137id.printer).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.paper_size).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.paper_type).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.layout).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.quality).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.paper_source).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.color).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.duplex).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.feed_direction).setClickable(bool.booleanValue());
-        findViewById(R.C2137id.printdate).setClickable(bool.booleanValue());
+        findViewById(R.id.printer).setClickable(bool.booleanValue());
+        findViewById(R.id.paper_size).setClickable(bool.booleanValue());
+        findViewById(R.id.paper_type).setClickable(bool.booleanValue());
+        findViewById(R.id.layout).setClickable(bool.booleanValue());
+        findViewById(R.id.quality).setClickable(bool.booleanValue());
+        findViewById(R.id.paper_source).setClickable(bool.booleanValue());
+        findViewById(R.id.color).setClickable(bool.booleanValue());
+        findViewById(R.id.duplex).setClickable(bool.booleanValue());
+        findViewById(R.id.feed_direction).setClickable(bool.booleanValue());
+        findViewById(R.id.printdate).setClickable(bool.booleanValue());
     }
 
     public void showErrorDialog(String str, String str2) {
@@ -2718,7 +2718,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != R.C2137id.menuSettingsDone) {
+        if (menuItem.getItemId() != R.id.menuSettingsDone) {
             return super.onOptionsItemSelected(menuItem);
         }
         saveChanged();

+ 63 - 63
app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java

@@ -52,7 +52,7 @@ import epson.common.ExternalFileUtils;
 import epson.common.Info_paper;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityRequestPermissions;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -238,53 +238,53 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         this.mPaperSize = new Size(0.0d, 0.0d);
         GetPaperInfo();
         this.mDaemonView = new DaemonView(this);
-        this.mCropImageFrameLayout = (FrameLayout) findViewById(R.C2137id.crop_image_frame_layout);
+        this.mCropImageFrameLayout = (FrameLayout) findViewById(R.id.crop_image_frame_layout);
         this.mCropImageFrameLayout.addView(this.mDaemonView);
-        this.mImageCollectLayout = (RelativeLayout) findViewById(R.C2137id.ImageCollectLayout);
-        this.mImageCollectPreviewLayout = (LinearLayout) findViewById(R.C2137id.ImageCollectPreviewLayout);
-        this.mImageCollectView = (ImageCollectView) this.mImageCollectPreviewLayout.findViewById(R.C2137id.ImageCollectView);
+        this.mImageCollectLayout = (RelativeLayout) findViewById(R.id.ImageCollectLayout);
+        this.mImageCollectPreviewLayout = (LinearLayout) findViewById(R.id.ImageCollectPreviewLayout);
+        this.mImageCollectView = (ImageCollectView) this.mImageCollectPreviewLayout.findViewById(R.id.ImageCollectView);
         this.mImageCollectView.SetHandler(mHandler);
-        this.mImageCollectPaperSizeInfo = (TextView) this.mImageCollectPreviewLayout.findViewById(R.C2137id.ImageCollectPaperSizeInfo);
+        this.mImageCollectPaperSizeInfo = (TextView) this.mImageCollectPreviewLayout.findViewById(R.id.ImageCollectPaperSizeInfo);
         this.mImageCollectPaperSizeInfo.setSingleLine(true);
         this.mImageCollectPaperSizeInfo.setEllipsize(TextUtils.TruncateAt.END);
         this.mImageCollectPaperSizeInfo.setText(getDocumentSizeText());
-        this.mImageCollectPalletButton = (Button) this.mImageCollectPreviewLayout.findViewById(R.C2137id.ImageCollectPalletButton);
+        this.mImageCollectPalletButton = (Button) this.mImageCollectPreviewLayout.findViewById(R.id.ImageCollectPalletButton);
         this.mImageCollectPalletButton.setOnClickListener(this);
         this.mImageCollectPalletButton.setVisibility(4);
-        this.mImageCollectSwitchLayout = (LinearLayout) findViewById(R.C2137id.ImageCollectSwitchLayout);
-        this.mImageCollectSwitch = (RadioGroup) findViewById(R.C2137id.ImageCollectSwitch);
-        this.mImageCollectSwitchLeft = (RadioButton) findViewById(R.C2137id.ImageCollectSwitchLeft);
+        this.mImageCollectSwitchLayout = (LinearLayout) findViewById(R.id.ImageCollectSwitchLayout);
+        this.mImageCollectSwitch = (RadioGroup) findViewById(R.id.ImageCollectSwitch);
+        this.mImageCollectSwitchLeft = (RadioButton) findViewById(R.id.ImageCollectSwitchLeft);
         this.mImageCollectSwitchLeft.setOnClickListener(this);
-        this.mImageCollectSwitchMiddle = (RadioButton) findViewById(R.C2137id.ImageCollectSwitchMiddle);
+        this.mImageCollectSwitchMiddle = (RadioButton) findViewById(R.id.ImageCollectSwitchMiddle);
         this.mImageCollectSwitchMiddle.setOnClickListener(this);
-        this.mImageCollectSwitchRight = (RadioButton) findViewById(R.C2137id.ImageCollectSwitchRight);
+        this.mImageCollectSwitchRight = (RadioButton) findViewById(R.id.ImageCollectSwitchRight);
         this.mImageCollectSwitchRight.setOnClickListener(this);
-        this.mImageCollectPalletLayout = (LinearLayout) findViewById(R.C2137id.ImageCollectPalletLayout);
-        this.mImageCollectAdjustmentBrightness = (LinearLayout) findViewById(R.C2137id.ImageCollectAdjustmentBrightness);
-        this.mImageCollectAdjustmentBrightnessTitle = (TextView) this.mImageCollectAdjustmentBrightness.findViewById(R.C2137id.AdjustmentBarTitle);
+        this.mImageCollectPalletLayout = (LinearLayout) findViewById(R.id.ImageCollectPalletLayout);
+        this.mImageCollectAdjustmentBrightness = (LinearLayout) findViewById(R.id.ImageCollectAdjustmentBrightness);
+        this.mImageCollectAdjustmentBrightnessTitle = (TextView) this.mImageCollectAdjustmentBrightness.findViewById(R.id.AdjustmentBarTitle);
         this.mImageCollectAdjustmentBrightnessTitle.setText(R.string.brightness);
-        this.mImageCollectAdjustmentBrightnessSeekBar = (SeekBar) this.mImageCollectAdjustmentBrightness.findViewById(R.C2137id.AdjustmentBarSeekBar);
+        this.mImageCollectAdjustmentBrightnessSeekBar = (SeekBar) this.mImageCollectAdjustmentBrightness.findViewById(R.id.AdjustmentBarSeekBar);
         this.mImageCollectAdjustmentBrightnessSeekBar.setOnSeekBarChangeListener(this);
-        this.mImageCollectAdjustmentContrast = (LinearLayout) findViewById(R.C2137id.ImageCollectAdjustmentContrast);
-        this.mImageCollectAdjustmentContrastTitle = (TextView) this.mImageCollectAdjustmentContrast.findViewById(R.C2137id.AdjustmentBarTitle);
+        this.mImageCollectAdjustmentContrast = (LinearLayout) findViewById(R.id.ImageCollectAdjustmentContrast);
+        this.mImageCollectAdjustmentContrastTitle = (TextView) this.mImageCollectAdjustmentContrast.findViewById(R.id.AdjustmentBarTitle);
         this.mImageCollectAdjustmentContrastTitle.setText(R.string.contrast);
-        this.mImageCollectAdjustmentContrastSeekBar = (SeekBar) this.mImageCollectAdjustmentContrast.findViewById(R.C2137id.AdjustmentBarSeekBar);
+        this.mImageCollectAdjustmentContrastSeekBar = (SeekBar) this.mImageCollectAdjustmentContrast.findViewById(R.id.AdjustmentBarSeekBar);
         this.mImageCollectAdjustmentContrastSeekBar.setOnSeekBarChangeListener(this);
-        this.mImageCollectAdjustmentSaturation = (LinearLayout) findViewById(R.C2137id.ImageCollectAdjustmentSaturation);
-        this.mImageCollectAdjustmentSaturationTitle = (TextView) this.mImageCollectAdjustmentSaturation.findViewById(R.C2137id.AdjustmentBarTitle);
+        this.mImageCollectAdjustmentSaturation = (LinearLayout) findViewById(R.id.ImageCollectAdjustmentSaturation);
+        this.mImageCollectAdjustmentSaturationTitle = (TextView) this.mImageCollectAdjustmentSaturation.findViewById(R.id.AdjustmentBarTitle);
         this.mImageCollectAdjustmentSaturationTitle.setText(R.string.saturation);
-        this.mImageCollectAdjustmentSaturationSeekBar = (SeekBar) this.mImageCollectAdjustmentSaturation.findViewById(R.C2137id.AdjustmentBarSeekBar);
+        this.mImageCollectAdjustmentSaturationSeekBar = (SeekBar) this.mImageCollectAdjustmentSaturation.findViewById(R.id.AdjustmentBarSeekBar);
         this.mImageCollectAdjustmentSaturationSeekBar.setOnSeekBarChangeListener(this);
-        this.mImageCollectAdjustmentSwitch = (RadioGroup) findViewById(R.C2137id.AdjustmentModeSwitch);
-        this.mImageCollectAdjustmentSwitchLeft = (RadioButton) findViewById(R.C2137id.AdjustmentModeSwitchLeft);
+        this.mImageCollectAdjustmentSwitch = (RadioGroup) findViewById(R.id.AdjustmentModeSwitch);
+        this.mImageCollectAdjustmentSwitchLeft = (RadioButton) findViewById(R.id.AdjustmentModeSwitchLeft);
         this.mImageCollectAdjustmentSwitchLeft.setOnClickListener(this);
-        this.mImageCollectAdjustmentSwitchRight = (RadioButton) findViewById(R.C2137id.AdjustmentModeSwitchRight);
+        this.mImageCollectAdjustmentSwitchRight = (RadioButton) findViewById(R.id.AdjustmentModeSwitchRight);
         this.mImageCollectAdjustmentSwitchRight.setOnClickListener(this);
-        this.mCropImageHeader = findViewById(R.C2137id.navigation_bar);
-        this.mToolBartLayout = (LinearLayout) findViewById(R.C2137id.tool_bar);
-        this.mToolbarCropImage = (LinearLayout) this.mToolBartLayout.findViewById(R.C2137id.ImageCollectToolbarCropImage);
-        this.mToolbarEnhanceText = (LinearLayout) this.mToolBartLayout.findViewById(R.C2137id.ImageCollectToolbarEnhanceText);
-        this.mToolbarColorAdjustment = (LinearLayout) this.mToolBartLayout.findViewById(R.C2137id.ImageCollectToolbarColorAdjustment);
+        this.mCropImageHeader = findViewById(R.id.navigation_bar);
+        this.mToolBartLayout = (LinearLayout) findViewById(R.id.tool_bar);
+        this.mToolbarCropImage = (LinearLayout) this.mToolBartLayout.findViewById(R.id.ImageCollectToolbarCropImage);
+        this.mToolbarEnhanceText = (LinearLayout) this.mToolBartLayout.findViewById(R.id.ImageCollectToolbarEnhanceText);
+        this.mToolbarColorAdjustment = (LinearLayout) this.mToolBartLayout.findViewById(R.id.ImageCollectToolbarColorAdjustment);
         this.mCropImageHeader.setOnTouchListener(this);
         this.mCropImageHeader.setOnClickListener(this);
         this.mToolbarCropImage.setOnTouchListener(this);
@@ -433,53 +433,53 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.C2137id.AdjustmentModeSwitchLeft /*2131230725*/:
-                if (this.mImageCollectAdjustmentSwitchId != R.C2137id.AdjustmentModeSwitchLeft) {
-                    this.mImageCollectAdjustmentSwitchId = R.C2137id.AdjustmentModeSwitchLeft;
+            case R.id.AdjustmentModeSwitchLeft /*2131230725*/:
+                if (this.mImageCollectAdjustmentSwitchId != R.id.AdjustmentModeSwitchLeft) {
+                    this.mImageCollectAdjustmentSwitchId = R.id.AdjustmentModeSwitchLeft;
                     AdjustmentModeSwitchALL();
                     return;
                 }
                 return;
-            case R.C2137id.AdjustmentModeSwitchRight /*2131230726*/:
-                if (this.mImageCollectAdjustmentSwitchId != R.C2137id.AdjustmentModeSwitchRight) {
-                    this.mImageCollectAdjustmentSwitchId = R.C2137id.AdjustmentModeSwitchRight;
+            case R.id.AdjustmentModeSwitchRight /*2131230726*/:
+                if (this.mImageCollectAdjustmentSwitchId != R.id.AdjustmentModeSwitchRight) {
+                    this.mImageCollectAdjustmentSwitchId = R.id.AdjustmentModeSwitchRight;
                     AdjustmentModeSwitchPART();
                     return;
                 }
                 return;
-            case R.C2137id.ImageCollectPalletButton /*2131230737*/:
+            case R.id.ImageCollectPalletButton /*2131230737*/:
                 palletShow();
                 return;
-            case R.C2137id.ImageCollectSwitchLeft /*2131230744*/:
-                if (this.mImageCollectSwitchId != R.C2137id.ImageCollectSwitchLeft) {
-                    this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchLeft;
+            case R.id.ImageCollectSwitchLeft /*2131230744*/:
+                if (this.mImageCollectSwitchId != R.id.ImageCollectSwitchLeft) {
+                    this.mImageCollectSwitchId = R.id.ImageCollectSwitchLeft;
                     ImageCollectSwitchPWC(1);
                     return;
                 }
                 return;
-            case R.C2137id.ImageCollectSwitchMiddle /*2131230745*/:
-                if (this.mImageCollectSwitchId != R.C2137id.ImageCollectSwitchMiddle) {
-                    this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchMiddle;
+            case R.id.ImageCollectSwitchMiddle /*2131230745*/:
+                if (this.mImageCollectSwitchId != R.id.ImageCollectSwitchMiddle) {
+                    this.mImageCollectSwitchId = R.id.ImageCollectSwitchMiddle;
                     ImageCollectSwitchPWC(2);
                     return;
                 }
                 return;
-            case R.C2137id.ImageCollectSwitchRight /*2131230746*/:
-                if (this.mImageCollectSwitchId != R.C2137id.ImageCollectSwitchRight) {
-                    this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchRight;
+            case R.id.ImageCollectSwitchRight /*2131230746*/:
+                if (this.mImageCollectSwitchId != R.id.ImageCollectSwitchRight) {
+                    this.mImageCollectSwitchId = R.id.ImageCollectSwitchRight;
                     ImageCollectSwitchCROP();
                     return;
                 }
                 return;
-            case R.C2137id.color_adjustment_button /*2131230932*/:
+            case R.id.color_adjustment_button /*2131230932*/:
                 activityModeChange(2);
                 InitBCSC();
                 return;
-            case R.C2137id.document_size_button /*2131230996*/:
+            case R.id.document_size_button /*2131230996*/:
                 this.mImageCollectView.MessageOff();
                 setDocumentSize();
                 return;
-            case R.C2137id.execute_button /*2131231032*/:
+            case R.id.execute_button /*2131231032*/:
                 int i = this.mActivityMode;
                 if (i == 0) {
                     this.mImageCollectView.MessageOff();
@@ -507,10 +507,10 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 } else {
                     return;
                 }
-            case R.C2137id.reset_button /*2131231403*/:
+            case R.id.reset_button /*2131231403*/:
                 MessageBox(101, -1, R.string.reset_color_adjustment_message, MSG_SDIC_BCSC_RESET);
                 return;
-            case R.C2137id.save_button /*2131231436*/:
+            case R.id.save_button /*2131231436*/:
                 mHandler.sendEmptyMessage(MSG_PREVIEW_SAVE_EXECUTE);
                 return;
             default:
@@ -707,7 +707,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 }).start();
                 return;
             case MSG_SDIC_PWC_FINISH /*812*/:
-                this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchLeft;
+                this.mImageCollectSwitchId = R.id.ImageCollectSwitchLeft;
                 this.mImageCollectSwitch.check(this.mImageCollectSwitchId);
                 this.mImageType = 2;
                 activityModeChange(1);
@@ -823,7 +823,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     }
 
     private void AdjustmentModeSwitchEXECUTE() {
-        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.C2137id.AdjustmentModeSwitchRight) {
+        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.id.AdjustmentModeSwitchRight) {
             AdjustmentModeProc(false, true, 0, 3);
         } else {
             AdjustmentModeProc(true, true, 0, 2);
@@ -847,7 +847,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         this.mImageCollect.ResetPreviewImageBCSC();
         this.mBcscType = this.mImageType;
         this.mImageCollect.MakePreviewImageBCSC_Init(this.mBcscType, true);
-        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.C2137id.AdjustmentModeSwitchRight) {
+        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.id.AdjustmentModeSwitchRight) {
             this.mImageCollectView.SetViewMode(3);
         } else {
             this.mImageCollectView.SetViewMode(2);
@@ -902,7 +902,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     }
 
     private void PreviewImageBCSC() {
-        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.C2137id.AdjustmentModeSwitchLeft) {
+        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.id.AdjustmentModeSwitchLeft) {
             this.mMaskType = 7;
         } else {
             this.mMaskType = 8;
@@ -1118,9 +1118,9 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             this.mToolbarCropImage.setVisibility(0);
             this.mToolbarEnhanceText.setVisibility(8);
             this.mToolbarColorAdjustment.setVisibility(8);
-            this.mButtonDocSize = (Button) this.mToolbarCropImage.findViewById(R.C2137id.document_size_button);
+            this.mButtonDocSize = (Button) this.mToolbarCropImage.findViewById(R.id.document_size_button);
             this.mButtonDocSize.setOnClickListener(this);
-            this.mButtonExecute = (Button) this.mToolbarCropImage.findViewById(R.C2137id.execute_button);
+            this.mButtonExecute = (Button) this.mToolbarCropImage.findViewById(R.id.execute_button);
             this.mButtonExecute.setText(R.string.execute_button);
             this.mButtonExecute.setOnClickListener(this);
             this.mImageCollectView.SetViewMode(0);
@@ -1140,11 +1140,11 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             this.mToolbarCropImage.setVisibility(8);
             this.mToolbarEnhanceText.setVisibility(0);
             this.mToolbarColorAdjustment.setVisibility(8);
-            this.mButtonSave = (Button) this.mToolbarEnhanceText.findViewById(R.C2137id.save_button);
+            this.mButtonSave = (Button) this.mToolbarEnhanceText.findViewById(R.id.save_button);
             this.mButtonSave.setOnClickListener(this);
-            this.mButtonColorAdjustment = (Button) this.mToolbarEnhanceText.findViewById(R.C2137id.color_adjustment_button);
+            this.mButtonColorAdjustment = (Button) this.mToolbarEnhanceText.findViewById(R.id.color_adjustment_button);
             this.mButtonColorAdjustment.setOnClickListener(this);
-            this.mButtonExecute = (Button) this.mToolbarEnhanceText.findViewById(R.C2137id.execute_button);
+            this.mButtonExecute = (Button) this.mToolbarEnhanceText.findViewById(R.id.execute_button);
             this.mButtonExecute.setText(R.string.print_preview_button);
             this.mButtonExecute.setOnClickListener(this);
             this.mImageCollectView.SetViewMode(1);
@@ -1159,13 +1159,13 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             this.mToolbarCropImage.setVisibility(8);
             this.mToolbarEnhanceText.setVisibility(8);
             this.mToolbarColorAdjustment.setVisibility(0);
-            this.mButtonReset = (Button) this.mToolbarColorAdjustment.findViewById(R.C2137id.reset_button);
+            this.mButtonReset = (Button) this.mToolbarColorAdjustment.findViewById(R.id.reset_button);
             this.mButtonReset.setOnClickListener(this);
             UiCommon.setButtonEnabled(this.mButtonReset, false);
-            this.mButtonExecute = (Button) this.mToolbarColorAdjustment.findViewById(R.C2137id.execute_button);
+            this.mButtonExecute = (Button) this.mToolbarColorAdjustment.findViewById(R.id.execute_button);
             this.mButtonExecute.setText(R.string.execute_button);
             this.mButtonExecute.setOnClickListener(this);
-            this.mImageCollectAdjustmentSwitchId = R.C2137id.AdjustmentModeSwitchLeft;
+            this.mImageCollectAdjustmentSwitchId = R.id.AdjustmentModeSwitchLeft;
             this.mImageCollectAdjustmentSwitch.check(this.mImageCollectAdjustmentSwitchId);
             AdjustmentModeSwitchALL();
             this.mImageCollectView.SetViewMode(2);

+ 19 - 19
app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeEditActivity.java

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
 import com.epson.cameracopy.printlayout.RegistedDocumentSizeList;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.widgets.LongTapRepeatAdapter;
 import java.math.BigDecimal;
 
@@ -42,17 +42,17 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_document_size_edit);
         setActionBar((int) R.string.document_size_edit_title, true);
-        this.mScale = (RadioGroup) findViewById(R.C2137id.document_size_scale);
+        this.mScale = (RadioGroup) findViewById(R.id.document_size_scale);
         this.mScale.setOnCheckedChangeListener(this);
-        this.mWidthText = (TextView) findViewById(R.C2137id.width);
-        this.mWidthDec = (Button) findViewById(R.C2137id.width_dec_button);
+        this.mWidthText = (TextView) findViewById(R.id.width);
+        this.mWidthDec = (Button) findViewById(R.id.width_dec_button);
         this.mWidthDec.setOnClickListener(this);
-        this.mWidthInc = (Button) findViewById(R.C2137id.width_inc_button);
+        this.mWidthInc = (Button) findViewById(R.id.width_inc_button);
         this.mWidthInc.setOnClickListener(this);
-        this.mHeightText = (TextView) findViewById(R.C2137id.height);
-        this.mHeightDec = (Button) findViewById(R.C2137id.height_dec_button);
+        this.mHeightText = (TextView) findViewById(R.id.height);
+        this.mHeightDec = (Button) findViewById(R.id.height_dec_button);
         this.mHeightDec.setOnClickListener(this);
-        this.mHeightInc = (Button) findViewById(R.C2137id.height_inc_button);
+        this.mHeightInc = (Button) findViewById(R.id.height_inc_button);
         this.mHeightInc.setOnClickListener(this);
         LongTapRepeatAdapter.bless(this.mWidthDec);
         LongTapRepeatAdapter.bless(this.mWidthInc);
@@ -70,16 +70,16 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.C2137id.height_dec_button /*2131231100*/:
+            case R.id.height_dec_button /*2131231100*/:
                 decHeight();
                 return;
-            case R.C2137id.height_inc_button /*2131231101*/:
+            case R.id.height_inc_button /*2131231101*/:
                 incHeight();
                 return;
-            case R.C2137id.width_dec_button /*2131231633*/:
+            case R.id.width_dec_button /*2131231633*/:
                 decWidth();
                 return;
-            case R.C2137id.width_inc_button /*2131231634*/:
+            case R.id.width_inc_button /*2131231634*/:
                 incWidth();
                 return;
             default:
@@ -89,10 +89,10 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     public void onCheckedChanged(RadioGroup radioGroup, int i) {
         if (i != -1) {
-            if (i == R.C2137id.inch_button) {
+            if (i == R.id.inch_button) {
                 this.mInch = true;
                 convertDocumentSize();
-            } else if (i == R.C2137id.mm_button) {
+            } else if (i == R.id.mm_button) {
                 this.mInch = false;
                 convertDocumentSize();
             }
@@ -103,10 +103,10 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     private void setDocumentSize() {
         this.mDocumentSizeInfo = (DocumentSizeInfo) getIntent().getParcelableExtra("DocumentSize");
         this.mPosition = getIntent().getIntExtra("DocumentSizePos", -1);
-        ((EditText) findViewById(R.C2137id.et_document_size)).setText(this.mDocumentSizeInfo.getDocSizeName(this));
+        ((EditText) findViewById(R.id.et_document_size)).setText(this.mDocumentSizeInfo.getDocSizeName(this));
         this.mInch = this.mDocumentSizeInfo.getScaleId() == 2;
         if (this.mInch) {
-            this.mScale.check(R.C2137id.inch_button);
+            this.mScale.check(R.id.inch_button);
             this.mWidth = this.mDocumentSizeInfo.getWidth();
             double roundDownValue = getRoundDownValue(this.mWidth, 1);
             TextView textView = this.mWidthText;
@@ -117,7 +117,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
             textView2.setText(String.valueOf(roundDownValue2) + " in");
             return;
         }
-        this.mScale.check(R.C2137id.mm_button);
+        this.mScale.check(R.id.mm_button);
         this.mWidth = this.mDocumentSizeInfo.getWidth();
         TextView textView3 = this.mWidthText;
         textView3.setText(String.valueOf((int) getRoundDownValue(this.mWidth, 0)) + " mm");
@@ -260,7 +260,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     }
 
     private void checkDocumentSize() {
-        String obj = ((EditText) findViewById(R.C2137id.et_document_size)).getText().toString();
+        String obj = ((EditText) findViewById(R.id.et_document_size)).getText().toString();
         if (obj.isEmpty()) {
             SimpleMessageDialogFragment.newInstance(R.string.no_name_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
             return;
@@ -300,7 +300,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != R.C2137id.menuSettingsDone) {
+        if (menuItem.getItemId() != R.id.menuSettingsDone) {
             return super.onOptionsItemSelected(menuItem);
         }
         checkDocumentSize();

+ 19 - 19
app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java

@@ -17,7 +17,7 @@ import android.widget.TextView;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
 import com.epson.cameracopy.printlayout.RegistedDocumentSizeList;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import java.util.Locale;
 
 /* renamed from: com.epson.cameracopy.ui.DocumentSizeSettingActivity */
@@ -40,7 +40,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_document_size_setting);
         setActionBar((int) R.string.document_size_title, true);
-        this.mListView = (ListView) findViewById(R.C2137id.docsize_list);
+        this.mListView = (ListView) findViewById(R.id.docsize_list);
         this.mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 DocumentSizeSettingActivity documentSizeSettingActivity = DocumentSizeSettingActivity.this;
@@ -49,15 +49,15 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         });
         this.mSelectListAdapter = new SelectListAdapter();
         this.mListView.setAdapter(this.mSelectListAdapter);
-        this.mSelect = (Button) findViewById(R.C2137id.select_button);
+        this.mSelect = (Button) findViewById(R.id.select_button);
         this.mSelect.setOnClickListener(this);
-        this.mEdit = (Button) findViewById(R.C2137id.edit_button);
+        this.mEdit = (Button) findViewById(R.id.edit_button);
         this.mEdit.setOnClickListener(this);
-        this.mDelete = (Button) findViewById(R.C2137id.delete_button);
+        this.mDelete = (Button) findViewById(R.id.delete_button);
         this.mDelete.setOnClickListener(this);
-        this.mAdd = (Button) findViewById(R.C2137id.add_button);
+        this.mAdd = (Button) findViewById(R.id.add_button);
         this.mAdd.setOnClickListener(this);
-        this.mClear = (Button) findViewById(R.C2137id.clear_button);
+        this.mClear = (Button) findViewById(R.id.clear_button);
         this.mClear.setOnClickListener(this);
     }
 
@@ -68,40 +68,40 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.C2137id.add_button /*2131230807*/:
+            case R.id.add_button /*2131230807*/:
                 addNewDocumentSize();
                 break;
-            case R.C2137id.clear_button /*2131230914*/:
+            case R.id.clear_button /*2131230914*/:
                 resetDocumentSizeList();
                 break;
-            case R.C2137id.delete_button /*2131230979*/:
+            case R.id.delete_button /*2131230979*/:
                 deleteDocumentSize();
                 break;
-            case R.C2137id.edit_button /*2131231009*/:
+            case R.id.edit_button /*2131231009*/:
                 editDocumentSize(this.mSelectPos);
                 break;
-            case R.C2137id.select_button /*2131231472*/:
+            case R.id.select_button /*2131231472*/:
                 selectDocumentSize(this.mSelectPos);
                 break;
         }
-        findViewById(R.C2137id.document_size_menu).setVisibility(4);
+        findViewById(R.id.document_size_menu).setVisibility(4);
     }
 
     public void onSelectDocsizeList(Object obj, View view, int i) {
         this.mSelectPos = i;
-        if (findViewById(R.C2137id.document_size_menu).getVisibility() != 0) {
+        if (findViewById(R.id.document_size_menu).getVisibility() != 0) {
             DocumentSizeInfo documentSizeInfo = (DocumentSizeInfo) obj;
-            ((TextView) findViewById(R.C2137id.menu_text)).setText(documentSizeInfo.getDocSizeName(this));
+            ((TextView) findViewById(R.id.menu_text)).setText(documentSizeInfo.getDocSizeName(this));
             boolean z = true;
             this.mEdit.setEnabled(documentSizeInfo.getPaperId() == -2);
             if (documentSizeInfo.getPaperId() == -1) {
                 z = false;
             }
             this.mDelete.setEnabled(z);
-            findViewById(R.C2137id.document_size_menu).setVisibility(0);
+            findViewById(R.id.document_size_menu).setVisibility(0);
             return;
         }
-        findViewById(R.C2137id.document_size_menu).setVisibility(4);
+        findViewById(R.id.document_size_menu).setVisibility(4);
     }
 
     private void addNewDocumentSize() {
@@ -205,8 +205,8 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
                 return view;
             }
             DocumentSizeInfo item = registedDocumentSizeList.getItem(i);
-            ((TextView) view.findViewById(R.C2137id.docsize_name)).setText(item.getDocSizeName(DocumentSizeSettingActivity.this));
-            ImageView imageView = (ImageView) view.findViewById(R.C2137id.current_docsize_image);
+            ((TextView) view.findViewById(R.id.docsize_name)).setText(item.getDocSizeName(DocumentSizeSettingActivity.this));
+            ImageView imageView = (ImageView) view.findViewById(R.id.current_docsize_image);
             if (this.mRegistedDocumentSizeList.isSelected(item)) {
                 imageView.setVisibility(0);
             } else {

+ 5 - 5
app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java

@@ -17,7 +17,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityRequestPermissions;
-import epson.print.C2135R;
+
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -66,9 +66,9 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         setActionBar((int) R.string.folder_selector_title, true);
         mActivity = new WeakReference<>(this);
         mFolderSelectActivity = (FolderSelectActivity) mActivity.get();
-        this.mFolderSelectBase = (LinearLayout) findViewById(R.C2137id.folder_select_base);
-        this.mFolderSelectCurrent = (LinearLayout) findViewById(R.C2137id.folder_select_current);
-        this.mFolderSelectText = (TextView) findViewById(R.C2137id.folder_select_text);
+        this.mFolderSelectBase = (LinearLayout) findViewById(R.id.folder_select_base);
+        this.mFolderSelectCurrent = (LinearLayout) findViewById(R.id.folder_select_current);
+        this.mFolderSelectText = (TextView) findViewById(R.id.folder_select_text);
         this.mMenuControl = new MenuControl(this, 1);
         this.mRootFolder = Environment.getExternalStorageDirectory().getAbsolutePath();
         this.mItemDataList = new ArrayList<>();
@@ -138,7 +138,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != R.C2137id.f337ok) {
+        if (menuItem.getItemId() != R.id.f337ok) {
             return super.onOptionsItemSelected(menuItem);
         }
         onActionbarMenuidOkClicked((View) null);

+ 1 - 1
app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java

@@ -1,7 +1,7 @@
 package com.epson.cameracopy.p006ui;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import com.epson.cameracopy.alt.FileUtils;
 import epson.common.ImageUtil;

+ 1 - 1
app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java

@@ -4,7 +4,7 @@ import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 
 /* renamed from: com.epson.cameracopy.ui.ImageFolderFileViewModel */
 public class ImageFolderFileViewModel extends AndroidViewModel {

+ 7 - 7
app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java

@@ -31,7 +31,7 @@ import epson.common.ImageUtil;
 import epson.common.ScalableImageView;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityRequestPermissions;
-import epson.print.C2135R;
+
 import epson.print.IprintApplication;
 import epson.print.Util.CommonMessage;
 import java.io.File;
@@ -76,7 +76,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
                 finish();
             } else if (cameraFile == null || new File(cameraFile.getValidFileName()).exists()) {
                 this.mFragment = PlaceholderFragment.getInstance(stringExtra, cameraFile);
-                getSupportFragmentManager().beginTransaction().add((int) R.C2137id.container, (Fragment) this.mFragment).commit();
+                getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) this.mFragment).commit();
             } else {
                 finish();
             }
@@ -200,9 +200,9 @@ public class ImagePreviewActivity extends ActivityIACommon {
 
         public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
             View inflate = layoutInflater.inflate(R.layout.fragment_image_preview_view, viewGroup, false);
-            this.mImageView = (ScalableImageView) inflate.findViewById(R.C2137id.preview_view);
-            this.mProgressBar = (ProgressBar) inflate.findViewById(R.C2137id.progressBar);
-            this.mSaveButton = (Button) inflate.findViewById(R.C2137id.save_button);
+            this.mImageView = (ScalableImageView) inflate.findViewById(R.id.preview_view);
+            this.mProgressBar = (ProgressBar) inflate.findViewById(R.id.progressBar);
+            this.mSaveButton = (Button) inflate.findViewById(R.id.save_button);
             this.mSaveButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
@@ -221,14 +221,14 @@ public class ImagePreviewActivity extends ActivityIACommon {
                     }
                 }
             });
-            ((Button) inflate.findViewById(R.C2137id.print_button)).setOnClickListener(new View.OnClickListener() {
+            ((Button) inflate.findViewById(R.id.print_button)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
                         PlaceholderFragment.this.startPrintPreviewActivity();
                     }
                 }
             });
-            ((Button) inflate.findViewById(R.C2137id.retouch_button)).setOnClickListener(new View.OnClickListener() {
+            ((Button) inflate.findViewById(R.id.retouch_button)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
                         PlaceholderFragment.this.startImageCollectActivity();

+ 3 - 3
app/src/main/java/com/epson/cameracopy/p006ui/ItemData.java

@@ -4,7 +4,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 
 /* renamed from: com.epson.cameracopy.ui.ItemData */
 /* compiled from: FolderSelectActivity */
@@ -18,8 +18,8 @@ class ItemData {
     }
 
     public void DrawItem(int i, View view, ViewGroup viewGroup) {
-        ImageView imageView = (ImageView) view.findViewById(R.C2137id.file_item_image);
-        TextView textView = (TextView) view.findViewById(R.C2137id.file_item_text);
+        ImageView imageView = (ImageView) view.findViewById(R.id.file_item_image);
+        TextView textView = (TextView) view.findViewById(R.id.file_item_text);
         if (this.mFileName != null) {
             imageView.setImageResource(R.C2136drawable.folder);
             textView.setText(this.mFileName);

+ 1 - 1
app/src/main/java/com/epson/cameracopy/p006ui/ItemDataAdapter.java

@@ -5,7 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import epson.print.C2135R;
+
 import java.util.List;
 
 /* renamed from: com.epson.cameracopy.ui.ItemDataAdapter */

+ 1 - 1
app/src/main/java/com/epson/cameracopy/p006ui/MenuControl.java

@@ -2,7 +2,7 @@ package com.epson.cameracopy.p006ui;
 
 import android.view.Menu;
 import android.view.MenuInflater;
-import epson.print.C2135R;
+
 
 /* renamed from: com.epson.cameracopy.ui.MenuControl */
 /* compiled from: FolderSelectActivity */

+ 3 - 3
app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java

@@ -11,7 +11,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.epson.cameracopy.device.CameraPreviewControl;
-import epson.print.C2135R;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -160,8 +160,8 @@ public class PictureResolutionDialogFragment extends DialogFragment {
             if (view == null) {
                 view = this.mLayoutInflater.inflate(R.layout.select_list_row, viewGroup, false);
             }
-            ((TextView) view.findViewById(R.C2137id.docsize_name)).setText((CharSequence) getItem(i));
-            ImageView imageView = (ImageView) view.findViewById(R.C2137id.current_docsize_image);
+            ((TextView) view.findViewById(R.id.docsize_name)).setText((CharSequence) getItem(i));
+            ImageView imageView = (ImageView) view.findViewById(R.id.current_docsize_image);
             if (i != this.mSelectNumber) {
                 imageView.setVisibility(4);
             } else {

+ 15 - 15
app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java

@@ -42,7 +42,7 @@ import epson.common.DialogProgressViewModel;
 import epson.common.ExternalFileUtils;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityNfcPrinter;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import epson.print.EPImage;
 import epson.print.EPImageList;
@@ -222,24 +222,24 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             finish();
             return;
         }
-        this.mPreviewView = (PreviewView) findViewById(R.C2137id.previewImageView);
-        this.papersizeTextView = (TextView) findViewById(R.C2137id.paper_size_text);
+        this.mPreviewView = (PreviewView) findViewById(R.id.previewImageView);
+        this.papersizeTextView = (TextView) findViewById(R.id.paper_size_text);
         this.papersizeTextView.setOnClickListener(this);
-        this.mPrintTargetSizeText = (TextView) findViewById(R.C2137id.printtarget_size_text);
+        this.mPrintTargetSizeText = (TextView) findViewById(R.id.printtarget_size_text);
         this.mPrintTargetSizeText.setOnClickListener(this);
-        this.mScaleText = (TextView) findViewById(R.C2137id.scale_text);
+        this.mScaleText = (TextView) findViewById(R.id.scale_text);
         this.mScaleText.setOnClickListener(this);
-        this.paperMissmath = (ImageView) findViewById(R.C2137id.icon_papermissmatch);
+        this.paperMissmath = (ImageView) findViewById(R.id.icon_papermissmatch);
         this.paperMissmath.setOnClickListener(this);
-        this.mOriginalImageSizeButton = (Button) findViewById(R.C2137id.paper_size_button);
+        this.mOriginalImageSizeButton = (Button) findViewById(R.id.paper_size_button);
         this.mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PrintPreviewActivity.this.startOrgImageSizeActivity();
             }
         });
-        this.rotateButton = (Button) findViewById(R.C2137id.rotate_button);
+        this.rotateButton = (Button) findViewById(R.id.rotate_button);
         this.rotateButton.setOnClickListener(this);
-        this.printButton = (Button) findViewById(R.C2137id.print_button);
+        this.printButton = (Button) findViewById(R.id.print_button);
         this.printButton.setOnClickListener(this);
         this.mPreviewView.setImage(this.mImageList.get(0).loadImageFileName);
         loadPrinterSettingAndChangeView(true);
@@ -652,9 +652,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.C2137id.icon_papermissmatch /*2131231117*/:
-            case R.C2137id.paper_size_text /*2131231310*/:
-            case R.C2137id.printtarget_size_text /*2131231374*/:
+            case R.id.icon_papermissmatch /*2131231117*/:
+            case R.id.paper_size_text /*2131231310*/:
+            case R.id.printtarget_size_text /*2131231374*/:
                 if (this.aPaperSourceSetting != null) {
                     Intent intent = new Intent();
                     intent.setClass(this, PaperSourceSettingScr.class);
@@ -665,7 +665,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 }
                 callPrintSetting();
                 return;
-            case R.C2137id.print_button /*2131231336*/:
+            case R.id.print_button /*2131231336*/:
                 this.mIsRemotePrinter = isRemotePrinter();
                 if (this.mIsRemotePrinter && this.enableShowWarning) {
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(this).setCancelable(false);
@@ -688,7 +688,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                     check3GAndStartPrint();
                     return;
                 }
-            case R.C2137id.rotate_button /*2131231420*/:
+            case R.id.rotate_button /*2131231420*/:
                 this.mPreviewView.rotateImageR90();
                 this.mPreviewView.update();
                 return;
@@ -698,7 +698,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() == R.C2137id.Menu_Show_PrintSettings) {
+        if (menuItem.getItemId() == R.id.Menu_Show_PrintSettings) {
             callPrintSetting();
         }
         return super.onOptionsItemSelected(menuItem);

+ 1 - 1
app/src/main/java/com/epson/cameracopy/p006ui/SimpleMessageDialogFragment.java

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.p000v4.app.DialogFragment;
-import epson.print.C2135R;
+
 
 /* renamed from: com.epson.cameracopy.ui.SimpleMessageDialogFragment */
 public class SimpleMessageDialogFragment extends DialogFragment {

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/AutoManuscriptSize.java

@@ -2,7 +2,7 @@ package com.epson.cameracopy.printlayout;
 
 import android.content.Context;
 import android.graphics.Point;
-import epson.print.C2135R;
+
 import java.util.Locale;
 
 /* compiled from: ManuscriptSize */

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/DocumentSizeInfo.java

@@ -3,7 +3,7 @@ package com.epson.cameracopy.printlayout;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import epson.print.C2135R;
+
 import java.io.Serializable;
 import java.util.LinkedList;
 import org.json.JSONArray;

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/IdManuscriptSize.java

@@ -5,7 +5,7 @@ import android.graphics.Point;
 import com.epson.cameracopy.printlayout.ManuscriptSize;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import epson.common.Info_paper;
-import epson.print.C2135R;
+
 
 /* compiled from: ManuscriptSize */
 class IdManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/ImageAndLayout.java

@@ -2,7 +2,7 @@ package com.epson.cameracopy.printlayout;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.VisibleForTesting;
 import com.epson.cameracopy.alt.SimpleBmpMerger;
 import epson.print.Util.ImageFileUtil;

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/ManuscriptSize.java

@@ -5,7 +5,7 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import com.epson.cameracopy.alt.AdditionalPrinterInfo;
 import epson.common.ImageUtil;
-import epson.print.C2135R;
+
 
 public class ManuscriptSize {
     static final /* synthetic */ boolean $assertionsDisabled = false;

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java

@@ -17,7 +17,7 @@ import android.view.ScaleGestureDetector;
 import android.view.View;
 import epson.common.ImageUtil;
 import epson.common.Info_paper;
-import epson.print.C2135R;
+
 import org.opencv.videoio.Videoio;
 
 public class PreviewView extends View {

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/RegistedDocumentSizeList.java

@@ -1,7 +1,7 @@
 package com.epson.cameracopy.printlayout;
 
 import android.content.Context;
-import epson.print.C2135R;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collection;

+ 1 - 1
app/src/main/java/com/epson/iprint/prtlogger/AnalyticsPreferences.java

@@ -1,7 +1,7 @@
 package com.epson.iprint.prtlogger;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 
 import com.epson.mobilephone.common.EpLog;
 

+ 1 - 1
app/src/main/java/com/epson/iprint/prtlogger/CommonLog.java

@@ -1,7 +1,7 @@
 package com.epson.iprint.prtlogger;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/epson/iprint/prtlogger/LoggerRecord.java

@@ -2,7 +2,7 @@ package com.epson.iprint.prtlogger;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.VisibleForTesting;
 
 public class LoggerRecord {

+ 1 - 1
app/src/main/java/com/epson/lib/escani2/ScanSize.java

@@ -1,6 +1,6 @@
 package com.epson.lib.escani2;
 
-import android.support.annotation.NonNull;
+
 import android.support.annotation.VisibleForTesting;
 import com.epson.lib.escani2.EscanI2Lib;
 import epson.scan.i2lib.I2ScanParamArbiter;

+ 1 - 1
app/src/main/java/com/epson/memcardacc/AltAlertDialogFragment.java

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.p000v4.app.DialogFragment;
-import epson.print.C2135R;
+
 
 public class AltAlertDialogFragment extends DialogFragment {
     private static final String ARG_MESSAGE = "message";

+ 1 - 1
app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java

@@ -10,7 +10,7 @@ import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import epson.print.ImageItem;
 import epson.print.Util.EPLog;

+ 4 - 4
app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java

@@ -14,7 +14,7 @@ import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import epson.print.Util.EPLog;
 import java.io.File;
@@ -79,10 +79,10 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             }
         });
         setActionBar((int) R.string.memcard_title_copy_confirm, true);
-        this.mFileNumText = (TextView) findViewById(R.C2137id.textFileNumber);
-        this.mFileSizeText = (TextView) findViewById(R.C2137id.textFileSize);
+        this.mFileNumText = (TextView) findViewById(R.id.textFileNumber);
+        this.mFileSizeText = (TextView) findViewById(R.id.textFileSize);
         this.mFileSizeText.setText(CommonDefine.QUESTION_MARK);
-        this.mCopyTargetPathText = (TextView) findViewById(R.C2137id.textWriteFolder);
+        this.mCopyTargetPathText = (TextView) findViewById(R.id.textWriteFolder);
         Intent intent = getIntent();
         this.mImageList = intent.getStringArrayListExtra(KEY_IMAGE_LIST);
         if (this.mImageList == null) {

+ 6 - 6
app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
@@ -17,7 +17,7 @@ import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
 import java.util.ArrayList;
@@ -88,10 +88,10 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             }
         });
         setActionBar((int) R.string.memcard_title_copy_confirm, true);
-        this.mFileNumText = (TextView) findViewById(R.C2137id.textFileNumber);
-        this.mFileSizeText = (TextView) findViewById(R.C2137id.textFileSize);
-        this.mCopyTargetPrinter = (TextView) findViewById(R.C2137id.textWritePrt);
-        this.mCopyTargetPathText = (TextView) findViewById(R.C2137id.textWriteFolder);
+        this.mFileNumText = (TextView) findViewById(R.id.textFileNumber);
+        this.mFileSizeText = (TextView) findViewById(R.id.textFileSize);
+        this.mCopyTargetPrinter = (TextView) findViewById(R.id.textWritePrt);
+        this.mCopyTargetPathText = (TextView) findViewById(R.id.textWriteFolder);
         this.mCopyTargetPathText.setText("");
         this.mImageList = null;
         this.mCopyTargetPrinter.setText(String.format(getResources().getString(R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));

+ 1 - 1
app/src/main/java/com/epson/memcardacc/CopyTask.java

@@ -1,7 +1,7 @@
 package com.epson.memcardacc;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import com.epson.iprint.prtlogger.CommonLog;
 import epson.print.Util.AsyncTaskExecutor;

+ 4 - 4
app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java

@@ -12,7 +12,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import java.io.File;
 
@@ -30,9 +30,9 @@ public class DirectorySelecterActivity extends Activity {
         super.onCreate(bundle);
         setContentView(R.layout.activity_directory_selecter);
         setTitle(getResources().getText(R.string.memcard_folder_save_to_string));
-        this.mBaseDirTextView = (TextView) findViewById(R.C2137id.baseDirText);
-        this.mTargetDir = (EditText) findViewById(R.C2137id.memcardUsername);
-        this.mOkButton = (Button) findViewById(R.C2137id.okButton);
+        this.mBaseDirTextView = (TextView) findViewById(R.id.baseDirText);
+        this.mTargetDir = (EditText) findViewById(R.id.memcardUsername);
+        this.mOkButton = (Button) findViewById(R.id.okButton);
         Intent intent = getIntent();
         String stringExtra = intent.getStringExtra(PARAM_BASE_DIRECTORY);
         String stringExtra2 = intent.getStringExtra(PARAM_DEFAULT_DIR);

+ 1 - 1
app/src/main/java/com/epson/memcardacc/FileConvertTask.java

@@ -1,7 +1,7 @@
 package com.epson.memcardacc;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import epson.common.ExternalFileUtils;
 import epson.common.ImageUtil;

+ 1 - 1
app/src/main/java/com/epson/memcardacc/FileConvertViewModel.java

@@ -5,7 +5,7 @@ import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MutableLiveData;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import com.epson.memcardacc.FileConvertTask;
 import java.util.ArrayList;

+ 4 - 4
app/src/main/java/com/epson/memcardacc/ImageFileListAdapter.java

@@ -8,7 +8,7 @@ import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -51,10 +51,10 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
         if (view == null) {
             view = this.mLayoutInflator.inflate(R.layout.memcard_card_grid_view_elem, viewGroup, false);
         }
-        ImageView imageView = (ImageView) view.findViewById(R.C2137id.thumbNail);
+        ImageView imageView = (ImageView) view.findViewById(R.id.thumbNail);
         FileInfoWithCheck fileInfoWithCheck = this.mFileInfoWithCheck.get(i);
         Bitmap thumNail = fileInfoWithCheck.getThumNail();
-        TextView textView = (TextView) view.findViewById(R.C2137id.baseDirText);
+        TextView textView = (TextView) view.findViewById(R.id.baseDirText);
         if (thumNail != null) {
             imageView.setImageBitmap(thumNail);
             textView.setVisibility(4);
@@ -74,7 +74,7 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
             imageView.setImageResource(R.C2136drawable.image);
             textView.setVisibility(4);
         }
-        ImageView imageView2 = (ImageView) view.findViewById(R.C2137id.checkImage);
+        ImageView imageView2 = (ImageView) view.findViewById(R.id.checkImage);
         if (fileInfoWithCheck.mChecked != 0) {
             imageView2.setVisibility(0);
         } else {

+ 1 - 1
app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.p000v4.app.DialogFragment;
-import epson.print.C2135R;
+
 
 public class LocalAlertDialogFragment extends DialogFragment {
     private static final String KEY_DIALOG_CODE = "dialog_code";

+ 3 - 3
app/src/main/java/com/epson/memcardacc/LocalProgressDialogFragment.java

@@ -2,14 +2,14 @@ package com.epson.memcardacc;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p003v7.app.AlertDialog;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 
 public class LocalProgressDialogFragment extends DialogFragment {
     private static final String ARGUMENT_MESSAGE_TEXT_ID = "resource-id";
@@ -35,7 +35,7 @@ public class LocalProgressDialogFragment extends DialogFragment {
         builder.setView(inflate);
         Bundle arguments = getArguments();
         if (!(arguments == null || (i = arguments.getInt(ARGUMENT_MESSAGE_TEXT_ID, 0)) == 0)) {
-            ((TextView) inflate.findViewById(R.C2137id.messageText)).setText(i);
+            ((TextView) inflate.findViewById(R.id.messageText)).setText(i);
         }
         return builder.create();
     }

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java

@@ -4,7 +4,7 @@ import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 import epson.common.ExternalFileUtils;
 import epson.common.ImageUtil;
 import java.io.File;

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemcardDialog.java

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import epson.print.C2135R;
+
 
 public class MemcardDialog {
     public static Dialog createDialog(Activity activity, int i, int i2) {

+ 6 - 6
app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java

@@ -27,7 +27,7 @@ import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.Util.EPLog;
 import java.io.UnsupportedEncodingException;
 import java.util.Deque;
@@ -132,9 +132,9 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         this.mImageFileListAdapter.setUpFolderString(getResources().getString(R.string.memcard_folder_up));
         setContentView((int) R.layout.activity_memcard_image_grid);
         setActionBar("", true);
-        this.mGridView = (GridView) findViewById(R.C2137id.gridView1);
+        this.mGridView = (GridView) findViewById(R.id.gridView1);
         this.mGridView.setAdapter(this.mImageFileListAdapter);
-        this.mSelectedFileNumText = (TextView) findViewById(R.C2137id.textSelectedImageNum);
+        this.mSelectedFileNumText = (TextView) findViewById(R.id.textSelectedImageNum);
         this.mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 MemcardImageGrid.this.gridViewItemClicked(adapterView, view, i, j);
@@ -147,7 +147,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         this.mImageFileListAdapter.setImageSize(this.mThumbnailWidth, this.mThumbnailHeight);
         this.mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(this.mGridView, this.mImageFileListAdapter, getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
         updateSelectedNumber();
-        this.mProgressBar = (ProgressBar) findViewById(R.C2137id.progressBar1);
+        this.mProgressBar = (ProgressBar) findViewById(R.id.progressBar1);
         this.mProgressBar.setVisibility(4);
         this.mMemcardStorageType = getIntent().getIntExtra("memcard_storage_type", 1);
         if (this.mMemcardStorageType <= 0) {
@@ -242,7 +242,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     public boolean onCreateOptionsMenu(Menu menu) {
         int selectedFileNum = this.mImageFileListAdapter.getSelectedFileNum();
         getMenuInflater().inflate(R.C2138menu.menu_image_selector, menu);
-        menu.findItem(R.C2137id.action_go_preview).setEnabled(selectedFileNum > 0);
+        menu.findItem(R.id.action_go_preview).setEnabled(selectedFileNum > 0);
         if (selectedFileNum <= 0) {
             setTitle(this.mImageFileListAdapter.getTargetDirectoryName());
         } else {
@@ -252,7 +252,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != R.C2137id.action_go_preview) {
+        if (menuItem.getItemId() != R.id.action_go_preview) {
             return super.onOptionsItemSelected(menuItem);
         }
         goNext();

+ 2 - 2
app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java

@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import com.epson.memcardacc.MemcardTempAlertDialog;
-import epson.print.C2135R;
+
 
 public class MemcardPhotocopyTop extends MemcardTopSuper {
     protected static final int DIALOG_TYPE_NOT_READY = 101;
@@ -32,7 +32,7 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
         setContentView((int) R.layout.activity_mcphotocopy_top);
         setActionBar((int) R.string.FunctionName_iPrint_PhotoTransfer, true);
         this.mLaunchType = 0;
-        findViewById(R.C2137id.photocopy_button).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.photocopy_button).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardPhotocopyTop.this.launchWriter();
             }

+ 6 - 6
app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java

@@ -14,7 +14,7 @@ import com.epson.iprint.prtlogger.Analytics;
 import com.epson.iprint.prtlogger.CommonLog;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.Utils;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import epson.print.Util.EPLog;
 import java.io.File;
@@ -50,16 +50,16 @@ public class MemcardReadProgress extends Activity {
         this.mImageList = intent.getStringArrayListExtra("imageList");
         this.mTargetFolderName = intent.getStringExtra("target_folder_name");
         this.mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
-        this.mTotalProgress = (ProgressBar) findViewById(R.C2137id.progress_percent);
+        this.mTotalProgress = (ProgressBar) findViewById(R.id.progress_percent);
         this.mTotalProgress.setVisibility(0);
-        this.mEachProgress = (ProgressBar) findViewById(R.C2137id.progress_copies);
+        this.mEachProgress = (ProgressBar) findViewById(R.id.progress_copies);
         this.mEachProgress.setVisibility(8);
-        this.mTextView = (TextView) findViewById(R.C2137id.percent);
-        ((TextView) findViewById(R.C2137id.copyingMessageText)).setText(getResources().getString(R.string.memcard_file_reading_message));
+        this.mTextView = (TextView) findViewById(R.id.percent);
+        ((TextView) findViewById(R.id.copyingMessageText)).setText(getResources().getString(R.string.memcard_file_reading_message));
         Intent intent2 = getIntent();
         this.mImageList = intent2.getStringArrayListExtra("imageList");
         this.mTargetFolderName = intent2.getStringExtra("target_folder_name");
-        this.mCancelButton = (Button) findViewById(R.C2137id.cancel_button);
+        this.mCancelButton = (Button) findViewById(R.id.cancel_button);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardReadProgress.this.actionCancel();

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemcardTempAlertDialog.java

@@ -3,7 +3,7 @@ package com.epson.memcardacc;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import epson.print.C2135R;
+
 
 public class MemcardTempAlertDialog {
 

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemcardTempAlertDialogFragment.java

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.p000v4.app.DialogFragment;
-import epson.print.C2135R;
+
 
 public class MemcardTempAlertDialogFragment extends DialogFragment {
     private static final String KEY_MESSAGE = "message";

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemcardTop.java

@@ -7,7 +7,7 @@ import android.os.Bundle;
 import android.view.View;
 import com.epson.memcardacc.MemcardTempAlertDialog;
 import epson.print.ActivityRequestPermissions;
-import epson.print.C2135R;
+
 
 public class MemcardTop extends MemcardTopSuper {
     private static final int REQEST_RUNTIMEPERMMISSION = 1;

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java

@@ -13,7 +13,7 @@ import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import java.util.Deque;
 
 public abstract class MemcardTopSuper extends ActivityIACommon implements PasswordDialogFragment.Callback, LocalAlertDialogFragment.DialogCallback {

+ 5 - 5
app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java

@@ -13,7 +13,7 @@ import com.epson.iprint.prtlogger.CommonLog;
 import com.epson.iprint.prtlogger.PrintLog;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.Utils;
-import epson.print.C2135R;
+
 import epson.print.Util.EPLog;
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
@@ -55,8 +55,8 @@ public class MemcardWriteProgress extends Activity {
         Utils.setFInishOnTOuchOutside(this, false);
         setContentView(R.layout.memcard_write_progress);
         this.mCountDownLatch = new CountDownLatch(1);
-        this.mSheetPerTotalText = (TextView) findViewById(R.C2137id.percent);
-        this.mTotalProgress = (ProgressBar) findViewById(R.C2137id.progress_percent);
+        this.mSheetPerTotalText = (TextView) findViewById(R.id.percent);
+        this.mTotalProgress = (ProgressBar) findViewById(R.id.progress_percent);
         Intent intent = getIntent();
         this.mImageList = intent.getStringArrayListExtra("imageList");
         this.mTargetFolderName = intent.getStringExtra("target_folder_name");
@@ -72,11 +72,11 @@ public class MemcardWriteProgress extends Activity {
                 setResult(3);
                 finish();
             }
-            ((TextView) findViewById(R.C2137id.copyingMessageText)).setText(R.string.mcphotocopy_sending_message);
+            ((TextView) findViewById(R.id.copyingMessageText)).setText(R.string.mcphotocopy_sending_message);
         }
         this.mCifsAccessStorageType = intent.getIntExtra(KEY_CIFS_STORAGE_TYPE, 1);
         this.mWifiDirectConnector = new WifiDirectConnector(this, intent.getBooleanExtra(KEY_CHECK_WIFI_DIRECT, false));
-        this.mCancelButton = (Button) findViewById(R.C2137id.cancel_button);
+        this.mCancelButton = (Button) findViewById(R.id.cancel_button);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardWriteProgress.this.actionCancelTask();

+ 6 - 6
app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java

@@ -11,7 +11,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 
 public class PasswordDialogFragment extends DialogFragment implements DialogInterface.OnKeyListener {
     private static final String ARG_KEY_FIRST_AUTHENTICATION = "first_authentication";
@@ -43,16 +43,16 @@ public class PasswordDialogFragment extends DialogFragment implements DialogInte
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         View inflate = View.inflate(getActivity(), R.layout.fragment_password_dialog, (ViewGroup) null);
-        this.mMessage = (TextView) inflate.findViewById(R.C2137id.password_message);
+        this.mMessage = (TextView) inflate.findViewById(R.id.password_message);
         this.mMessage.setText(z ? R.string.memcard_password_input_message : R.string.memcard_password_incorrect_message);
-        this.mUserNameEdit = (EditText) inflate.findViewById(R.C2137id.memcardUsername);
-        this.mPasswordEdit = (EditText) inflate.findViewById(R.C2137id.memcardPassword);
-        ((ImageButton) inflate.findViewById(R.C2137id.imageButton1)).setOnClickListener(new View.OnClickListener() {
+        this.mUserNameEdit = (EditText) inflate.findViewById(R.id.memcardUsername);
+        this.mPasswordEdit = (EditText) inflate.findViewById(R.id.memcardPassword);
+        ((ImageButton) inflate.findViewById(R.id.imageButton1)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PasswordDialogFragment.this.mUserNameEdit.getText().clear();
             }
         });
-        ((ImageButton) inflate.findViewById(R.C2137id.imageButton2)).setOnClickListener(new View.OnClickListener() {
+        ((ImageButton) inflate.findViewById(R.id.imageButton2)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PasswordDialogFragment.this.mPasswordEdit.getText().clear();
             }

+ 2 - 2
app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java

@@ -6,13 +6,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.FragmentActivity;
 import com.epson.memcardacc.AltAlertDialogFragment;
 import com.epson.memcardacc.FileConvertTask;
 import com.epson.memcardacc.FileConvertViewModel;
-import epson.print.C2135R;
+
 import epson.print.imgsel.ImageFinder;
 import epson.print.imgsel.ImageSelectActivity;
 import epson.print.imgsel.JpegHeifImageFinder;

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java

@@ -8,11 +8,11 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
-import epson.print.C2135R;
+
 
 public class ReviewInvitationDialog extends DialogFragment {
     private static final String GOOGLE_PLAY_STORE_ID = "market://details?id=epson.print";

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ReviewInvitationViewModel.java

@@ -3,7 +3,7 @@ package com.epson.mobilephone.common;
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.MutableLiveData;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.VisibleForTesting;
 import java.util.Locale;
 

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/StoreReview.java

@@ -2,7 +2,7 @@ package com.epson.mobilephone.common;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java

@@ -11,7 +11,7 @@ import android.os.HandlerThread;
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;
-import epson.print.C2135R;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CancellationException;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java

@@ -12,7 +12,7 @@ import android.bluetooth.le.ScanSettings;
 import android.content.Context;
 import android.os.Build;
 import android.os.ParcelUuid;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.util.SparseArray;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java

@@ -13,7 +13,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java

@@ -6,7 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
@@ -30,7 +30,7 @@ import com.epson.mobilephone.common.ble.util.ScannedDevice;
 import epson.epsonconnectregistration.ActivityECConfiguration;
 import epson.maintain.activity.PrinterNotFoundDialogCreator;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -92,7 +92,7 @@ public class BleWorkActivity extends ActivityIACommon {
         requestWindowFeature(5);
         setContentView((int) R.layout.activity_scan);
         setActionBar((int) R.string.BLE_select_unconfigured_printer_title, true);
-        findViewById(R.C2137id.progress_bar).setVisibility(8);
+        findViewById(R.id.progress_bar).setVisibility(8);
         this.mContext = this;
         callBackFuncs();
         getWindow().addFlags(128);
@@ -347,11 +347,11 @@ public class BleWorkActivity extends ActivityIACommon {
         this.mAlertDialog = new AlertDialog.Builder(this.mContext).setCancelable(false).create();
         View inflate = LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         this.mAlertDialog.setView(inflate);
-        this.mProgressPercent = (ProgressBar) inflate.findViewById(R.C2137id.progress_percent);
+        this.mProgressPercent = (ProgressBar) inflate.findViewById(R.id.progress_percent);
         this.mProgressPercent.setVisibility(0);
-        this.mPercentView = (TextView) inflate.findViewById(R.C2137id.percent);
+        this.mPercentView = (TextView) inflate.findViewById(R.id.percent);
         this.mPercentView.setVisibility(0);
-        inflate.findViewById(R.C2137id.space_upper).setVisibility(0);
+        inflate.findViewById(R.id.space_upper).setVisibility(0);
         this.mProgressPercent.setProgress(0);
         this.mProgressPercent.setMax(100);
         this.mPercentView.setText("0%");
@@ -410,7 +410,7 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void init(ArrayList<ScannedDevice> arrayList) {
-        ListView listView = (ListView) findViewById(R.C2137id.list);
+        ListView listView = (ListView) findViewById(R.id.list);
         Collections.sort(arrayList, new ScannedDeviceComparator());
         this.mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
         listView.setAdapter(this.mDeviceAdapter);

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

@@ -12,7 +12,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;
-import epson.print.C2135R;
+
 import epson.print.IprintApplication;
 import java.util.Iterator;
 import java.util.List;
@@ -35,19 +35,19 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
         if (view == null) {
             view = this.mInflater.inflate(this.mResId, (ViewGroup) null);
         }
-        TextView textView = (TextView) view.findViewById(R.C2137id.device_name);
+        TextView textView = (TextView) view.findViewById(R.id.device_name);
         textView.setText(scannedDevice.getDisplayName());
         if (IprintApplication.isReleaseUnlimited()) {
-            ((TextView) view.findViewById(R.C2137id.device_address)).setText(scannedDevice.getDevice().getAddress());
-            TextView textView2 = (TextView) view.findViewById(R.C2137id.device_rssi);
+            ((TextView) view.findViewById(R.id.device_address)).setText(scannedDevice.getDevice().getAddress());
+            TextView textView2 = (TextView) view.findViewById(R.id.device_rssi);
             textView2.setText(PREFIX_RSSI + Integer.toString(scannedDevice.getRssi()));
             textView2.setTextColor(-3355444);
         } else {
-            view.findViewById(R.C2137id.device_address).setVisibility(8);
-            view.findViewById(R.C2137id.device_rssi).setVisibility(8);
+            view.findViewById(R.id.device_address).setVisibility(8);
+            view.findViewById(R.id.device_rssi).setVisibility(8);
             textView.setPadding(0, 20, 0, 20);
         }
-        ((ImageView) view.findViewById(R.C2137id.signal)).setImageDrawable(getThresholdIcon(scannedDevice.getRssi()));
+        ((ImageView) view.findViewById(R.id.signal)).setImageDrawable(getThresholdIcon(scannedDevice.getRssi()));
         return view;
     }
 

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java

@@ -2,7 +2,7 @@ package com.epson.mobilephone.common.ble.util;
 
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import com.epson.mobilephone.common.EpLog;
 

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java

@@ -4,12 +4,12 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentManager;
 import android.support.p000v4.app.FragmentStatePagerAdapter;
 import android.support.p000v4.view.ViewPager;
-import android.support.p003v7.app.AppCompatActivity;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/license/C1073Util.java

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.license;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.RawRes;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/license/DefaultLicenseInfo.java

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.license;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 
 public abstract class DefaultLicenseInfo implements LicenseInfo {
     private String getDefaultSoftwareLicense(@NonNull Context context) {

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/license/DefaultUserSurveyInfo.java

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.license;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 
 public abstract class DefaultUserSurveyInfo implements UserSurveyInfo {
     public String getUserSurveyInvitationText(@NonNull Context context) {

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java

@@ -3,11 +3,11 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.p003v7.app.ActionBar;
-import android.support.p003v7.app.AppCompatActivity;
+
 import android.support.p003v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.TextView;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/license/LicenseInfo.java

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.license;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java

@@ -3,9 +3,9 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
-import android.support.p003v7.app.AppCompatActivity;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;

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

@@ -5,7 +5,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.p000v4.app.DialogFragment;
 
 public class SimpleMessageDialogFragment extends DialogFragment {

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInfo.java

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.license;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import java.io.Serializable;
 import java.lang.annotation.Retention;

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInvitationActivity.java

@@ -3,8 +3,8 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.p003v7.app.AppCompatActivity;
+
+
 import android.support.p003v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -5,7 +5,7 @@ import android.content.IntentFilter;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.p003v7.app.AppCompatActivity;
+
 
 public abstract class ActivityConnectBase extends AppCompatActivity {
     public static final String APNAME = "com.epson.iprint.wifidirect.apname";

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java

@@ -16,7 +16,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.Fragment;
 import android.widget.LinearLayout;

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 
 public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     public static final int ID_NEXT = 10;
@@ -65,7 +65,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != R.C2137id.menuCancel) {
+        if (menuItem.getItemId() != R.id.menuCancel) {
             return super.onOptionsItemSelected(menuItem);
         }
         onCancelPressed();

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectError.java

@@ -4,7 +4,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 
 public class ActivityWiFiDirectError extends ActivityWiFiDirectBase {
     private static final String TAG = "ActivityWiFiDirectError";
@@ -16,6 +16,6 @@ public class ActivityWiFiDirectError extends ActivityWiFiDirectBase {
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, true);
         WiFiUtils instance = WiFiUtils.getInstance(this);
-        ((TextView) viewGroup.findViewById(R.C2137id.textView1)).setText(getResources().getString(R.string.str_cur_wifi_state, new Object[]{instance.getSSID(instance.getCurNetworkId())}));
+        ((TextView) viewGroup.findViewById(R.id.textView1)).setText(getResources().getString(R.string.str_cur_wifi_state, new Object[]{instance.getSSID(instance.getCurNetworkId())}));
     }
 }

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

@@ -8,7 +8,7 @@ import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
@@ -18,7 +18,7 @@ import android.webkit.WebView;
 import android.widget.Toast;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
-import epson.print.C2135R;
+
 import java.util.Deque;
 
 public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
@@ -80,7 +80,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
-        this.viewWiFiSettings = viewGroup.findViewById(R.C2137id.rlWifiSettings);
+        this.viewWiFiSettings = viewGroup.findViewById(R.id.rlWifiSettings);
         this.viewWiFiSettings.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
@@ -89,8 +89,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectManual.this.startActivityForResult(intent, 0);
             }
         });
-        this.mNoLcdGuidanceWebView = (WebView) findViewById(R.C2137id.guidance_webview);
-        this.mWithLcdGuidanceView = (ViewGroup) findViewById(R.C2137id.guidance_with_lcd);
+        this.mNoLcdGuidanceWebView = (WebView) findViewById(R.id.guidance_webview);
+        this.mWithLcdGuidanceView = (ViewGroup) findViewById(R.id.guidance_with_lcd);
         updateGuidance(getNoLcdValueFromIntent(getIntent()));
         if (!ActivityRequestLocationPermission.canAccessWiFiInfo(this, 1)) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 1);

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectStart.java

@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
-import epson.print.C2135R;
+
 
 public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
     private static final int ID_ENABLEWIFI = 1;
@@ -14,7 +14,7 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
         super.onCreate(bundle);
         setContentView((int) R.layout.wifidirect_start);
         setupCommonHeaderControl(false, true);
-        this.viewiPrintConnect = ((ViewGroup) findViewById(R.C2137id.wifi_start_top)).findViewById(R.C2137id.iprint_connect);
+        this.viewiPrintConnect = ((ViewGroup) findViewById(R.id.wifi_start_top)).findViewById(R.id.iprint_connect);
         this.viewiPrintConnect.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
@@ -22,12 +22,12 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectStart.this.startActivityForResult(intent, 1);
             }
         });
-        findViewById(R.C2137id.width_lcd).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.width_lcd).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityWiFiDirectStart.this.startWifiManualSetup(false);
             }
         });
-        findViewById(R.C2137id.no_lcd).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.no_lcd).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityWiFiDirectStart.this.startWifiManualSetup(true);
             }

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

@@ -15,7 +15,7 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.epson.mobilephone.common.wifidirect.escprLib;
-import epson.print.C2135R;
+
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -75,12 +75,12 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, false);
-        this.toolbar = (ViewGroup) viewGroup.findViewById(R.C2137id.toolbar);
-        this.btnFinish = (Button) viewGroup.findViewById(R.C2137id.btn_finish);
-        this.textView1 = (TextView) viewGroup.findViewById(R.C2137id.textView1);
-        this.textView2 = (TextView) viewGroup.findViewById(R.C2137id.textView2);
-        this.textView3 = (TextView) viewGroup.findViewById(R.C2137id.textView3);
-        this.progress = (ProgressBar) viewGroup.findViewById(R.C2137id.progressBarGetConnectStrings);
+        this.toolbar = (ViewGroup) viewGroup.findViewById(R.id.toolbar);
+        this.btnFinish = (Button) viewGroup.findViewById(R.id.btn_finish);
+        this.textView1 = (TextView) viewGroup.findViewById(R.id.textView1);
+        this.textView2 = (TextView) viewGroup.findViewById(R.id.textView2);
+        this.textView3 = (TextView) viewGroup.findViewById(R.id.textView3);
+        this.progress = (ProgressBar) viewGroup.findViewById(R.id.progressBarGetConnectStrings);
         this.btnFinish.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityiPrintConnect.this.onFinishPressed();

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

@@ -11,7 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import com.epson.mobilephone.common.wifidirect.escprLib;
-import epson.print.C2135R;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +31,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
-        this.btnNext = (Button) viewGroup.findViewById(R.C2137id.btn_next);
+        this.btnNext = (Button) viewGroup.findViewById(R.id.btn_next);
         this.btnNext.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);

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

@@ -3,7 +3,7 @@ package com.epson.mobilephone.common.wifidirect;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentManager;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiNetworkManager.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.RequiresApi;
 
 @RequiresApi(api = 21)

+ 1 - 1
app/src/main/java/epson/colorcorrection/ImageCollect.java

@@ -7,7 +7,7 @@ import android.graphics.RectF;
 import android.media.ExifInterface;
 import android.os.Debug;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+
 import android.text.format.DateFormat;
 import android.util.Log;
 import com.epson.cameracopy.p006ui.CropImageActivity;

+ 4 - 4
app/src/main/java/epson/common/CustomListRowAdapter.java

@@ -8,7 +8,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 import epson.print.Util.EPLog;
 import java.util.List;
 
@@ -42,12 +42,12 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
         EPLog.m305d(TAG, "View position [" + i + "]");
         CustomListRow customListRow = this.items.get(i);
         if (customListRow.getPrefixImageId() != null) {
-            ((ImageView) view.findViewById(R.C2137id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());
+            ((ImageView) view.findViewById(R.id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());
         }
         if (customListRow.getSuffixImageId() != null) {
-            ((ImageView) view.findViewById(R.C2137id.row_suffix_image)).setImageResource(customListRow.getSuffixImageId().intValue());
+            ((ImageView) view.findViewById(R.id.row_suffix_image)).setImageResource(customListRow.getSuffixImageId().intValue());
         }
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.C2137id.row_list_area);
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.row_list_area);
         linearLayout.removeAllViews();
         int sieze = customListRow.sieze();
         for (int i2 = 0; i2 < sieze; i2++) {

+ 6 - 6
app/src/main/java/epson/common/DialogProgress.java

@@ -3,7 +3,7 @@ package epson.common;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentManager;
@@ -13,7 +13,7 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import epson.print.C2135R;
+
 
 public class DialogProgress extends DialogFragment {
     public static final int MESSAGE_BOTTOM = 1;
@@ -105,22 +105,22 @@ public class DialogProgress extends DialogFragment {
                 }
             });
         }
-        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.C2137id.dialog_progress_id);
+        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.id.dialog_progress_id);
         if (i == 1) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) progressBar.getLayoutParams();
             layoutParams.addRule(14);
             progressBar.setLayoutParams(layoutParams);
-            TextView textView = (TextView) inflate.findViewById(R.C2137id.dialog_progress_text_bottom);
+            TextView textView = (TextView) inflate.findViewById(R.id.dialog_progress_text_bottom);
             textView.setText(string);
             progressBar.setVisibility(0);
             textView.setVisibility(0);
         } else if (i == 0) {
-            TextView textView2 = (TextView) inflate.findViewById(R.C2137id.dialog_progress_text_right);
+            TextView textView2 = (TextView) inflate.findViewById(R.id.dialog_progress_text_right);
             textView2.setText(string);
             progressBar.setVisibility(0);
             textView2.setVisibility(0);
         } else {
-            TextView textView3 = (TextView) inflate.findViewById(R.C2137id.dialog_progress_text_right);
+            TextView textView3 = (TextView) inflate.findViewById(R.id.dialog_progress_text_right);
             textView3.setText(string);
             textView3.setVisibility(0);
         }

+ 1 - 1
app/src/main/java/epson/common/ExifCopy.java

@@ -1,7 +1,7 @@
 package epson.common;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.RequiresApi;
 import android.support.media.ExifInterface;
 import java.io.IOException;

+ 1 - 1
app/src/main/java/epson/common/ExternalFileUtils.java

@@ -1,7 +1,7 @@
 package epson.common;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import epson.print.Util.EPLog;

+ 1 - 1
app/src/main/java/epson/common/InformationGuide.java

@@ -2,7 +2,7 @@ package epson.common;
 
 import android.app.Application;
 import android.content.Context;
-import epson.print.C2135R;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;

+ 1 - 1
app/src/main/java/epson/common/IprintAppRecord.java

@@ -3,7 +3,7 @@ package epson.common;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+
 
 public class IprintAppRecord {
     private static final String KEY_LICENSE_AGREE_TIME = "license_agree_time";

+ 2 - 2
app/src/main/java/epson/common/IprintLicenseInfo.java

@@ -1,9 +1,9 @@
 package epson.common;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import com.epson.mobilephone.common.license.DefaultLicenseInfo;
-import epson.print.C2135R;
+
 import java.util.Locale;
 
 public class IprintLicenseInfo extends DefaultLicenseInfo {

+ 1 - 1
app/src/main/java/epson/common/IprintUserSurveyInfo.java

@@ -1,7 +1,7 @@
 package epson.common;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import com.epson.iprint.prtlogger.NewLoggerController;
 import com.epson.mobilephone.common.license.DefaultUserSurveyInfo;
 

+ 1 - 1
app/src/main/java/epson/common/OsAssistant.java

@@ -2,7 +2,7 @@ package epson.common;
 
 import android.app.Activity;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
+
 import android.view.Display;
 
 public class OsAssistant {

+ 2 - 2
app/src/main/java/epson/common/ReviewInvitationDialog.java

@@ -8,11 +8,11 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
-import epson.print.C2135R;
+
 
 public class ReviewInvitationDialog extends DialogFragment {
     private static final String GOOGLE_PLAY_STORE_ID = "market://details?id=epson.print";

+ 1 - 1
app/src/main/java/epson/common/ReviewInvitationViewModel.java

@@ -3,7 +3,7 @@ package com.epson.mobilephone.common;
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.MutableLiveData;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.VisibleForTesting;
 import java.util.Locale;
 

+ 1 - 1
app/src/main/java/epson/common/StoreReview.java

@@ -2,7 +2,7 @@ package com.epson.mobilephone.common;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;

+ 1 - 1
app/src/main/java/epson/common/Utils.java

@@ -15,7 +15,7 @@ import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.view.KeyEvent;
 import android.widget.TextView;

+ 1 - 1
app/src/main/java/epson/common/ble/BleAsyncTask.java

@@ -11,7 +11,7 @@ import android.os.HandlerThread;
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;
-import epson.print.C2135R;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CancellationException;

+ 1 - 1
app/src/main/java/epson/common/ble/BleScanWork.java

@@ -12,7 +12,7 @@ import android.bluetooth.le.ScanSettings;
 import android.content.Context;
 import android.os.Build;
 import android.os.ParcelUuid;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.util.SparseArray;

+ 1 - 1
app/src/main/java/epson/common/ble/BleWork.java

@@ -13,7 +13,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.Nullable;
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;

+ 7 - 7
app/src/main/java/epson/common/ble/BleWorkActivity.java

@@ -6,7 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
@@ -30,7 +30,7 @@ import com.epson.mobilephone.common.ble.util.ScannedDevice;
 import epson.epsonconnectregistration.ActivityECConfiguration;
 import epson.maintain.activity.PrinterNotFoundDialogCreator;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+
 import epson.print.CommonDefine;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -92,7 +92,7 @@ public class BleWorkActivity extends ActivityIACommon {
         requestWindowFeature(5);
         setContentView((int) R.layout.activity_scan);
         setActionBar((int) R.string.BLE_select_unconfigured_printer_title, true);
-        findViewById(R.C2137id.progress_bar).setVisibility(8);
+        findViewById(R.id.progress_bar).setVisibility(8);
         this.mContext = this;
         callBackFuncs();
         getWindow().addFlags(128);
@@ -347,11 +347,11 @@ public class BleWorkActivity extends ActivityIACommon {
         this.mAlertDialog = new AlertDialog.Builder(this.mContext).setCancelable(false).create();
         View inflate = LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         this.mAlertDialog.setView(inflate);
-        this.mProgressPercent = (ProgressBar) inflate.findViewById(R.C2137id.progress_percent);
+        this.mProgressPercent = (ProgressBar) inflate.findViewById(R.id.progress_percent);
         this.mProgressPercent.setVisibility(0);
-        this.mPercentView = (TextView) inflate.findViewById(R.C2137id.percent);
+        this.mPercentView = (TextView) inflate.findViewById(R.id.percent);
         this.mPercentView.setVisibility(0);
-        inflate.findViewById(R.C2137id.space_upper).setVisibility(0);
+        inflate.findViewById(R.id.space_upper).setVisibility(0);
         this.mProgressPercent.setProgress(0);
         this.mProgressPercent.setMax(100);
         this.mPercentView.setText("0%");
@@ -410,7 +410,7 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void init(ArrayList<ScannedDevice> arrayList) {
-        ListView listView = (ListView) findViewById(R.C2137id.list);
+        ListView listView = (ListView) findViewById(R.id.list);
         Collections.sort(arrayList, new ScannedDeviceComparator());
         this.mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
         listView.setAdapter(this.mDeviceAdapter);

Some files were not shown because too many files changed in this diff