Rebrand for ReplicantHEADreplicant-6.0

Metrics setup is removed. The Wi-Fi setup page is disabled because
none of the currently supported devices have the internal Wi-Fi
working.

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

2 files changed, 0 insertions, 73 deletions

diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
index 5c90b4e..da86a23 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
@@ -55,9 +55,6 @@ public class CMSetupWizardData extends AbstractSetupData {
         pages.add(new WelcomePage(mContext, this));
         pages.add(new LocalePage(mContext, this));
         pages.add(new DateTimePage(mContext, this));
-        if (SetupWizardUtils.hasWifi(mContext)) {
-            pages.add(new WifiSetupPage(mContext, this));
-        }
         if (SetupWizardUtils.hasTelephony(mContext)) {
             pages.add(new SimCardMissingPage(mContext, this)
                     .setHidden(isSimInserted()));
diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
index 866371d..a52925f 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -55,7 +55,6 @@ public class CyanogenSettingsPage extends SetupPage {
 
     public static final String TAG = "CyanogenSettingsPage";
 
-    public static final String KEY_SEND_METRICS = "send_metrics";
     public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
     public static final String KEY_APPLY_DEFAULT_THEME = "apply_default_theme";
     public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
@@ -131,21 +130,10 @@ public class CyanogenSettingsPage extends SetupPage {
                 }
             }
         });
-        handleEnableMetrics();
         handleDefaultThemeSetup();
         handlePrivacyGuard();
     }
 
-    private void handleEnableMetrics() {
-        Bundle privacyData = getData();
-        if (privacyData != null
-                && privacyData.containsKey(KEY_SEND_METRICS)) {
-            CMSettings.Secure.putInt(mContext.getContentResolver(),
-                    CMSettings.Secure.STATS_COLLECTION, privacyData.getBoolean(KEY_SEND_METRICS)
-                            ? 1 : 0);
-        }
-    }
-
     private void handleDefaultThemeSetup() {
         Bundle privacyData = getData();
         if (!SetupWizardUtils.getDefaultThemePackageName(mContext).equals(
@@ -193,11 +181,9 @@ public class CyanogenSettingsPage extends SetupPage {
         private View mKillSwitchView;
         private TextView mKillSwitchTitle;
         private ImageView mKillSwitchStatus;
-        private View mMetricsRow;
         private View mDefaultThemeRow;
         private View mNavKeysRow;
         private View mPrivacyGuardRow;
-        private CheckBox mMetrics;
         private CheckBox mDefaultTheme;
         private CheckBox mNavKeys;
         private CheckBox mPrivacyGuard;
@@ -206,15 +192,6 @@ public class CyanogenSettingsPage extends SetupPage {
         private boolean mHideThemeRow = false;
 
 
-        private View.OnClickListener mMetricsClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                boolean checked = !mMetrics.isChecked();
-                mMetrics.setChecked(checked);
-                mPage.getData().putBoolean(KEY_SEND_METRICS, checked);
-            }
-        };
-
         private View.OnClickListener mDefaultThemeClickListener = new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -244,30 +221,6 @@ public class CyanogenSettingsPage extends SetupPage {
 
         @Override
         protected void initializePage() {
-            String privacy_policy = getString(R.string.services_privacy_policy);
-            String policySummary = getString(R.string.services_explanation, privacy_policy);
-            SpannableString ss = new SpannableString(policySummary);
-            ClickableSpan clickableSpan = new ClickableSpan() {
-                @Override
-                public void onClick(View textView) {
-                    // At this point of the setup, the device has already been unlocked (if frp
-                    // had been enabled), so there should be no issues regarding security
-                    final Intent intent = new Intent(Intent.ACTION_VIEW,
-                            Uri.parse(PRIVACY_POLICY_URI));
-                    try {
-                        getActivity().startActivity(intent);
-                    } catch (Exception e) {
-                        Log.e(TAG, "Unable to start activity " + intent.toString(), e);
-                    }
-                }
-            };
-            ss.setSpan(clickableSpan,
-                    policySummary.length() - privacy_policy.length() - 1,
-                    policySummary.length() - 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            TextView privacyPolicy = (TextView) mRootView.findViewById(R.id.privacy_policy);
-            privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());
-            privacyPolicy.setText(ss);
-
             mKillSwitchView = mRootView.findViewById(R.id.killswitch);
             mKillSwitchTitle = (TextView)mRootView.findViewById(R.id.killswitch_title);
             mKillSwitchStatus = (ImageView)mRootView.findViewById(R.id.killswitch_check);
@@ -283,19 +236,6 @@ public class CyanogenSettingsPage extends SetupPage {
                 }
             }
 
-            mMetricsRow = mRootView.findViewById(R.id.metrics);
-            mMetricsRow.setOnClickListener(mMetricsClickListener);
-            String metricsHelpImproveCM =
-                    getString(R.string.services_help_improve_cm, getString(R.string.os_name));
-            String metricsSummary = getString(R.string.services_metrics_label,
-                    metricsHelpImproveCM, getString(R.string.os_name));
-            final SpannableStringBuilder metricsSpan = new SpannableStringBuilder(metricsSummary);
-            metricsSpan.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
-                    0, metricsHelpImproveCM.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            TextView metrics = (TextView) mRootView.findViewById(R.id.enable_metrics_summary);
-            metrics.setText(metricsSpan);
-            mMetrics = (CheckBox) mRootView.findViewById(R.id.enable_metrics_checkbox);
-
             mDefaultThemeRow = mRootView.findViewById(R.id.theme);
             mHideThemeRow = hideThemeSwitch(getActivity());
             if (mHideThemeRow) {
@@ -350,19 +290,9 @@ public class CyanogenSettingsPage extends SetupPage {
         public void onResume() {
             super.onResume();
             updateDisableNavkeysOption();
-            updateMetricsOption();
             updateThemeOption();
         }
 
-        private void updateMetricsOption() {
-            final Bundle myPageBundle = mPage.getData();
-            boolean metricsChecked =
-                    !myPageBundle.containsKey(KEY_SEND_METRICS) || myPageBundle
-                            .getBoolean(KEY_SEND_METRICS);
-            mMetrics.setChecked(metricsChecked);
-            myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked);
-        }
-
         private void updateThemeOption() {
             if (!mHideThemeRow) {
                 final Bundle myPageBundle = mPage.getData();