0

app/src/main/AndroidManifest.xml

@@ -631,18 +631,7 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths_scannedfile" />
         </provider>
-        <receiver
-            android:name="com.google.android.gms.analytics.AnalyticsReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
-            </intent-filter>
-        </receiver>
-        <service
-            android:name="com.google.android.gms.analytics.AnalyticsService"
-            android:enabled="true"
-            android:exported="false" />
+
 
         <meta-data
             android:name="com.epson.iprint.prtlogger2.queryserver"
@@ -677,36 +666,6 @@
             android:resizeableActivity="false"
             android:theme="@style/AppTheme.Translucent_epWiFiDirectManager" />
 
-        <service
-            android:name="com.google.android.gms.analytics.AnalyticsJobService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <activity
-            android:name="com.google.android.gms.auth.api.signin.internal.SignInHubActivity"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:theme="@style/Theme.Translucent.NoTitleBar" />
-        <service
-            android:name="com.google.android.gms.auth.api.signin.RevocationBoundService"
-            android:exported="true"
-            android:permission="com.google.android.gms.auth.api.signin.permission.REVOCATION_NOTIFICATION" />
-        <activity
-            android:name="com.google.android.gms.common.api.GoogleApiActivity"
-            android:exported="false"
-            android:theme="@style/Theme.Translucent.NoTitleBar" />
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
-        <activity
-            android:name="com.box.androidsdk.content.auth.OAuthActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
-        <activity
-            android:name="com.box.androidsdk.content.auth.BlockedIPErrorActivity"
-            android:launchMode="singleInstance" />
-
         <provider
             android:name="android.arch.lifecycle.ProcessLifecycleOwnerInitializer"
             android:authorities="epson.print.lifecycle-trojan"

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

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Build;
 
 import epson.print.imgsel.ImageFinder;
-import epson.print.imgsel.ImageSelectActivity;
 import epson.print.imgsel.JpegHeifImageFinder;
 import epson.print.imgsel.JpegImageFinder;
 

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

@@ -5,11 +5,6 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 
-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.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -17,6 +12,11 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import com.epson.guidelib.R;
 import com.epson.mobilephone.common.guide.GuideWebviewFragment;
 

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

@@ -5,11 +5,11 @@ import android.content.Context;
 
 public abstract class DefaultLicenseInfo implements LicenseInfo {
     private String getDefaultSoftwareLicense(@NonNull Context context) {
-        return C1073Util.getStringFromRawResource(context, C1066R.raw.eula);
+        return C1073Util.getStringFromRawResource(context, R.raw.eula);
     }
 
     private String getDefaultPrivacyStatement(@NonNull Context context) {
-        return C1073Util.getStringFromRawResource(context, C1066R.raw.privacy);
+        return C1073Util.getStringFromRawResource(context, R.raw.privacy);
     }
 
     public String getDocumentString(@NonNull Context context, int i) {

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

@@ -5,14 +5,14 @@ import android.content.Context;
 
 public abstract class DefaultUserSurveyInfo implements UserSurveyInfo {
     public String getUserSurveyInvitationText(@NonNull Context context) {
-        return C1073Util.getStringFromRawResource(context, C1066R.raw.user_survey);
+        return C1073Util.getStringFromRawResource(context, R.raw.user_survey);
     }
 
     @NonNull
     public String getButtonString(@NonNull Context context, int i) {
         if (i != 1) {
-            return context.getString(C1066R.string.Cancel);
+            return context.getString(R.string.Cancel);
         }
-        return context.getString(C1066R.string.f148OK);
+        return context.getString(R.string.f148OK);
     }
 }

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

@@ -3,17 +3,19 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
-
-import android.support.annotation.VisibleForTesting;
-import android.support.p003v7.app.ActionBar;
-
-import android.support.p003v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.io.Serializable;
 
+import epson.print.R;
+
 public class InfoDisplayActivity extends AppCompatActivity {
     private static final String KEY_SCROLL_Y = "scroll_y";
     private static final String PARAM_KEY_DOCUMENT_TYPE = "document_type";
@@ -32,15 +34,15 @@ public class InfoDisplayActivity extends AppCompatActivity {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         supportRequestWindowFeature(8);
-        setContentView(C1066R.layout.activity_info_display);
-        setSupportActionBar((Toolbar) findViewById(C1066R.C1068id.toolbar));
+        setContentView(R.layout.activity_info_display);
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         TitleAndDocument titleAndDocumentFromIntent = getTitleAndDocumentFromIntent(getIntent());
         if (titleAndDocumentFromIntent == null) {
             finish();
             return;
         }
-        ((TextView) findViewById(C1066R.C1068id.contentText)).setText(titleAndDocumentFromIntent.getDocumentString(getApplicationContext()));
-        mScrollView = (RestoreScrollView) findViewById(C1066R.C1068id.mainScrollView);
+        ((TextView) findViewById(R.id.contentText)).setText(titleAndDocumentFromIntent.getDocumentString(getApplicationContext()));
+        mScrollView = (RestoreScrollView) findViewById(R.id.mainScrollView);
         setTitle(titleAndDocumentFromIntent.getTitle(getApplicationContext()));
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {
@@ -81,11 +83,11 @@ public class InfoDisplayActivity extends AppCompatActivity {
     private static int getTitleStringId(int i) {
         switch (i) {
             case 2:
-                return C1066R.string.Privacy_Statement_Title;
+                return R.string.Privacy_Statement_Title;
             case 3:
-                return C1066R.string.OSS_License_Title;
+                return R.string.OSS_License_Title;
             default:
-                return C1066R.string.EULA_Title;
+                return R.string.EULA_Title;
         }
     }
 

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

@@ -10,9 +10,14 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.epson.mobilephone.common.license.SimpleMessageDialogFragment;
 
 import epson.common.Constants;
+import epson.print.R;
 
 public class LicenseTopActivity extends AppCompatActivity implements SimpleMessageDialogFragment.DialogCallback {
     private static final String DIALOG_ID = "dialog";
@@ -29,23 +34,23 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView(C1066R.layout.activity_license_top);
-        ((ViewGroup) findViewById(C1066R.C1068id.licenseViewGroup)).setOnClickListener(new View.OnClickListener() {
+        setContentView(R.layout.activity_license_top);
+        ((ViewGroup) findViewById(R.id.licenseViewGroup)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 LicenseTopActivity.this.startDocumentDisplayActivity(1);
             }
         });
-        ((ViewGroup) findViewById(C1066R.C1068id.privacyStatementViewGroup)).setOnClickListener(new View.OnClickListener() {
+        ((ViewGroup) findViewById(R.id.privacyStatementViewGroup)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 LicenseTopActivity.this.startDocumentDisplayActivity(2);
             }
         });
-        ((Button) findViewById(C1066R.C1068id.agreeButton)).setOnClickListener(new View.OnClickListener() {
+        ((Button) findViewById(R.id.agreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 LicenseTopActivity.this.onAgree();
             }
         });
-        ((Button) findViewById(C1066R.C1068id.disagreeButton)).setOnClickListener(new View.OnClickListener() {
+        ((Button) findViewById(R.id.disagreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 LicenseTopActivity.this.onDisagree();
             }
@@ -55,7 +60,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
             finish();
             return;
         }
-        ((TextView) findViewById(C1066R.C1068id.appNameText)).setText(mLicenseInfo.getApplicationName(this));
+        ((TextView) findViewById(R.id.appNameText)).setText(mLicenseInfo.getApplicationName(this));
         if (bundle == null) {
             showLicenseChangeDialogIfNeeded(this, mLicenseInfo, mUserSurveyInfo);
         }
@@ -77,13 +82,13 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         String str;
         switch (licenseInfo.getLicenseAgreement(context)) {
             case 0:
-                str = getString(C1066R.string.EULA_Title) + Constants.BREAK_LINE + getString(C1066R.string.Privacy_Statement_Title);
+                str = getString(R.string.EULA_Title) + Constants.BREAK_LINE + getString(R.string.Privacy_Statement_Title);
                 break;
             case 1:
-                str = getString(C1066R.string.EULA_Title);
+                str = getString(R.string.EULA_Title);
                 break;
             case 2:
-                str = getString(C1066R.string.Privacy_Statement_Title);
+                str = getString(R.string.Privacy_Statement_Title);
                 break;
             case 3:
                 setResult(-1);
@@ -97,7 +102,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
             default:
                 return;
         }
-        SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Update_Message) + Constants.BREAK_LINE + str, 1).show(getSupportFragmentManager(), DIALOG_ID);
+        SimpleMessageDialogFragment.newInstance(getString(R.string.Update_Message) + Constants.BREAK_LINE + str, 1).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
     private void onAgree() {
@@ -127,7 +132,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     }
 
     private void onDisagree() {
-        SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Disagree_License_Button_Message), 2).show(getSupportFragmentManager(), DIALOG_ID);
+        SimpleMessageDialogFragment.newInstance(getString(R.string.Disagree_License_Button_Message), 2).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
     private void startDocumentDisplayActivity(int i) {

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

@@ -39,7 +39,7 @@ public class SimpleMessageDialogFragment extends DialogFragment {
     @NonNull
     public Dialog onCreateDialog(Bundle bundle) {
         super.onCreateDialog(bundle);
-        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(mMessageString).setPositiveButton(C1066R.string.f148OK, new DialogInterface.OnClickListener() {
+        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(mMessageString).setPositiveButton(R.string.f148OK, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 SimpleMessageDialogFragment.this.onOkClicked();
             }

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

@@ -11,6 +11,9 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.epson.mobilephone.common.license.SimpleMessageDialogFragment;
 
 import epson.common.Constants;
@@ -32,27 +35,27 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
     protected void onCreate(Bundle bundle) {
         UserSurveyInfo userSurveyInfo;
         super.onCreate(bundle);
-        setContentView(C1066R.layout.activity_user_survey_invitation);
-        setSupportActionBar((Toolbar) findViewById(C1066R.C1068id.toolbar));
-        setTitle(C1066R.string.GALicense);
-        Button button = (Button) findViewById(C1066R.C1068id.disagreeButton);
+        setContentView(R.layout.activity_user_survey_invitation);
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        setTitle(R.string.GALicense);
+        Button button = (Button) findViewById(R.id.disagreeButton);
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 UserSurveyInvitationActivity.this.finishWithStatus(false);
             }
         });
-        Button button2 = (Button) findViewById(C1066R.C1068id.agreeButton);
+        Button button2 = (Button) findViewById(R.id.agreeButton);
         button2.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 UserSurveyInvitationActivity.this.finishWithStatus(true);
             }
         });
-        ((ViewGroup) findViewById(C1066R.C1068id.privacyStatementViewGroup)).setOnClickListener(new View.OnClickListener() {
+        ((ViewGroup) findViewById(R.id.privacyStatementViewGroup)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 UserSurveyInvitationActivity.this.startPrivacyStatementDisplayActivity();
             }
         });
-        TextView textView = (TextView) findViewById(C1066R.C1068id.analytics_content);
+        TextView textView = (TextView) findViewById(R.id.analytics_content);
         mDisplayChangeDialog = false;
         Intent intent = getIntent();
         if (intent != null) {
@@ -64,7 +67,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
                 str = userSurveyInfo2.getUserSurveyInvitationText(this);
             }
             if (str == null) {
-                str = C1073Util.getStringFromRawResource(getApplicationContext(), C1066R.raw.user_survey);
+                str = C1073Util.getStringFromRawResource(getApplicationContext(), R.raw.user_survey);
             }
             textView.setText(str);
             changeButtonText(button2, 1, mUserSurveyInfo, this);
@@ -87,12 +90,12 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
     private void updateAppNameText(LicenseInfo licenseInfo) {
         String applicationName;
         if (licenseInfo != null && (applicationName = licenseInfo.getApplicationName(this)) != null) {
-            ((TextView) findViewById(C1066R.C1068id.appNameText)).setText(applicationName);
+            ((TextView) findViewById(R.id.appNameText)).setText(applicationName);
         }
     }
 
     private void showUpdateDialog() {
-        SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Update_Message) + Constants.BREAK_LINE + getString(C1066R.string.GALicense), 1).show(getSupportFragmentManager(), (String) null);
+        SimpleMessageDialogFragment.newInstance(getString(R.string.Update_Message) + Constants.BREAK_LINE + getString(R.string.GALicense), 1).show(getSupportFragmentManager(), (String) null);
     }
 
     private void changeButtonText(Button button, int i, UserSurveyInfo userSurveyInfo, @NonNull Context context) {