diff --git a/res/drawable/logo.xml b/res/drawable/logo.xml
index a17c0dd..b2ce0d3 100644
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -1,12 +1,14 @@
+ android:width="505.60703dp"
+ android:height="805.48474dp"
+ android:viewportWidth="505.60703"
+ android:viewportHeight="805.48474">
+ android:fillColor="#ff0000"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5743742"
+ android:pathData="M217.51,55.3726 C215.662,55.503,213.88,56.7404,212.947,60.3726
+C211.034,67.8251,218.904,95.7329,222.697,108.404
+C216.336,108.83,210.266,109.481,204.478,110.373 L166.948,81.6538
+C166.948,81.6538,155.829,80.6998,159.51,89.9976
+C161.542,95.1305,173.954,105.857,184.729,114.529
+C81.904,142.443,85.0086,248.239,85.5415,248.341 L397.76,248.341
+C397.76,248.341,397.759,107.841,239.323,107.841
+C239.113,107.841,238.907,107.841,238.698,107.841 L223.886,58.0285
+C223.886,58.0285,220.592,55.155,217.511,55.3723 Z" />
+ android:fillColor="#ffffff"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="1.33132184"
+ android:pathData="M332.261,143.257 C332.261,143.257,347.054,143.257,347.054,158.262
+C347.054,173.267,332.261,173.267,332.261,173.267
+C332.261,173.267,317.468,173.267,317.468,158.262
+C317.468,143.257,333.048,143.755,332.261,143.257 Z" />
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5743742"
+ android:pathData="M255.464,180.956 C315.464,240.956,395.464,240.956,395.464,240.956
+L395.464,240.956" />
+ android:fillColor="#ff0000"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5743742"
+ android:pathData="M60.2857,391.135 L217.907,327.452
+C217.907,327.452,241.976,306.942,230.738,279.126
+C219.5,251.31,187.939,254.466,187.939,254.466 L30.3172,316.961
+C30.3172,316.961,6.2477,337.471,17.4859,365.286
+C28.7241,393.102,61.1127,391.669,60.2857,391.135 Z" />
+ android:fillColor="#ff0000"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5743742"
+ android:pathData="M217.854,429.28 L100.404,552.184
+C100.404,552.184,86.9072,580.782,108.596,601.508
+C130.285,622.234,158.241,607.454,158.241,607.454 L275.691,484.55
+C275.691,484.55,289.188,455.952,267.499,435.226
+C245.81,414.5,216.881,429.134,217.854,429.28 Z" />
+ android:fillColor="#000000"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5741291"
+ android:pathData="M92.7915,551.248 C82.6647,551.007,73.3921,559.596,72.8498,569.709
+C71.8303,579.799,79.6957,589.704,89.7457,591.017
+C94.268,590.032,92.3738,594.916,93.8423,597.662
+C96.4192,605.617,104.421,611.38,112.791,611.247
+C112.55,621.374,121.139,630.646,131.252,631.189
+C141.342,632.209,151.247,624.343,152.56,614.293
+C154.299,604.473,147.489,594.161,137.789,591.877
+C134.693,591.343,131.764,591.77,132.478,587.707
+C130.99,578.421,122.198,571.056,112.79,571.247
+C112.986,560.455,103.594,551.052,92.79,551.247 Z" />
+ android:fillColor="#ff0000"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5743742"
+ android:pathData="M85.0297,253.442 C84.978,253.858,85.0293,454.567,85.0293,494.567
+C85.0293,534.567,145.029,534.567,145.029,534.567
+C145.029,534.567,245.029,534.567,245.029,534.567 L245.029,533.411
+C264.916,533.411,338.435,533.411,338.435,533.411
+C338.435,533.411,397.759,533.407,397.759,493.411
+C397.759,453.415,397.814,253.858,397.759,253.442
+C289.86,253.442,182.823,253.442,85.029,253.442 Z" />
+ android:fillColor="#ff0000"
+ android:strokeColor="#ffffff"
+ android:strokeWidth="3.5743742"
+ android:pathData="M239.005,442.14 L239.005,612.14 C239.005,612.14,249.005,642.14,279.005,642.14
+C309.005,642.14,319.005,612.14,319.005,612.14 L319.005,442.14
+C319.005,442.14,309.005,412.14,279.005,412.14
+C249.005,412.14,238.2,442.707,239.005,442.14 Z" />
+
+
+
+
+
+
+
+
diff --git a/res/layout/setup_cyanogen_services.xml b/res/layout/setup_cyanogen_services.xml
index 203376a..9547afc 100644
--- a/res/layout/setup_cyanogen_services.xml
+++ b/res/layout/setup_cyanogen_services.xml
@@ -38,18 +38,6 @@
android:layout_height="match_parent"
style="@style/PageContent">
-
-
-
-
-
-
-
-
-
-
-
-
Setup Wizard
cyanogenmod
- LineageOS
+ Replicant
Material
Next
@@ -68,7 +68,7 @@
Emergency call
- LineageOS features
+ Replicant features
These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s %s.
These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s %s.
Privacy Policy
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();