Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67cc3b5c authored by Michael Bestas's avatar Michael Bestas Committed by Gerrit Code Review
Browse files

SetupWizard: Improve strings 

Change-Id: I3b850d0772e1c3e5eddb0218c7e41360ee233470
parent 5d3bce42

res/layout/setup_cyanogen_services.xml

+3 −6
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ 
                        android:layout_marginLeft="@dimen/location_text_margin_left"

                        android:layout_marginRight="@dimen/location_text_margin_right"

                        android:paddingBottom="@dimen/content_margin_bottom"

                        android:text="@string/services_metrics_label"

                        android:maxLines="5" />

                        android:text="@string/services_metrics_label"/>



                </LinearLayout>
@@ -119,8 +118,7 @@ 
                        android:layout_marginLeft="@dimen/location_text_margin_left"

                        android:layout_marginRight="@dimen/location_text_margin_right"

                        android:paddingBottom="@dimen/content_margin_bottom"

                        android:text="@string/services_os_nav_keys_label"

                        android:maxLines="5" />

                        android:text="@string/services_os_nav_keys_label"/>



                </LinearLayout>
@@ -155,8 +153,7 @@ 
                        android:layout_marginLeft="@dimen/location_text_margin_left"

                        android:layout_marginRight="@dimen/location_text_margin_right"

                        android:paddingBottom="@dimen/content_margin_bottom"

                        android:text="@string/services_secure_sms_label"

                        android:maxLines="5" />

                        android:text="@string/services_secure_sms_label"/>



                </LinearLayout>

            </LinearLayout>

res/values/strings.xml

+14 −21
Original line number Diff line number Diff line
@@ -17,32 +17,23 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Setup Wizard</string>

    <string name="product_name" translatable="false">cyanogenmod</string>

    <string name="os_name" translatable="false">CyanogenMod</string>



    <string name="cm_account_type" translatable="false">com.cyanogenmod.account</string>



    <string name="next">Next</string>

    <string name="continue_label">Continue</string>

    <string name="skip">Skip</string>

    <string name="finish">Finish</string>

    <string name="start">Start</string>

    <string name="cancel">Cancel</string>

    <string name="create">Create</string>

    <string name="login">Login</string>

    <string name="ok">OK</string>

    <string name="existing">Existing</string>

    <string name="new_account">New</string>

    <string name="skip_anyway">Skip anyway</string>

    <string name="dont_skip">Don\'t skip</string>

    <string name="loading">Just a sec...</string>

    <string name="loading">Just a sec\u2026</string>



    <string name="setup_complete">Setup is complete</string>

    <string name="setup_welcome">Welcome</string>

    <string name="setup_wifi">Select Wi-Fi</string>

    <string name="setup_sim_missing">SIM Card Missing</string>

    <string name="setup_gms_account">GMS account</string>

    <string name="setup_choose_data_sim">Choose a SIM for Data</string>

    <string name="setup_location">Location Services</string>

    <string name="setup_other">Other Services</string>

    <string name="setup_sim_missing">SIM card missing</string>

    <string name="setup_choose_data_sim">Choose a SIM for data</string>

    <string name="setup_location">Location services</string>

    <string name="setup_other">Other services</string>

    <string name="setup_datetime">Date &amp; time</string>

    <string name="setup_current_date">Current date</string>

    <string name="setup_current_time">Current time</string>
@@ -60,7 +51,7 @@ 
    <string name="location_gps"><b>Improve location accuracy</b> by allowing apps to use the GPS on your phone.</string>

    <string name="location_network"><b>Use Google\'s location service</b> to help apps determine your location. This means sending annonymous location data to Google, even when no apps are running.</string>



    <string name="setup_mobile_data">Turn On Mobile Data</string>

    <string name="setup_mobile_data">Turn on mobile data</string>

    <string name="setup_mobile_data_no_service">No service</string>

    <string name="setup_mobile_data_emergency_only">Emergency calls only</string>

    <string name="enable_mobile_data_summary">Do you want to use mobile data during setup? Turning on mobile data may be subject to data charges.</string>
@@ -69,12 +60,14 @@ 


    <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>



    <string name="emergency_call">Emergency Call</string>

    <string name="emergency_call">Emergency call</string>



    <string name="setup_services">Cyanogen services</string>

    <string name="services_explanation">These services work for you to extend the capabilities of your device. You can turn them off at anytime. Data will be used in accordance with Cyanogen\'s %s.</string>

    <string name="services_explanation">These services work for you to extend the capabilities of your device. You can turn them off at anytime. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>

    <string name="services_privacy_policy">Privacy Policy</string>

    <string name="services_metrics_label"><b>Help improve Cyanogen OS</b> by automatically sending diagnostic and usage data to Cyanogen. This information won’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new Cyanogen OS features.</string>

    <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>

    <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> by automatically sending diagnostic and usage data to Cyanogen. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%s</xliff:g> features.</string>

    <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> to move between screens instead of hardware keys.</string>

    <string name="services_secure_sms_label"><b>Use secure SMS</b> to encrypt SMS conversations with other users using secure SMS on a Cyanogen OS device.</string>

    <string name="services_use_secure_sms">Use secure SMS</string>

    <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%s</xliff:g> device.</string>

</resources>

src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java

+31 −8
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ import android.os.Handler; 
import android.os.RemoteException;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.text.Spannable;

import android.text.SpannableString;

import android.text.SpannableStringBuilder;

import android.text.Spanned;

import android.text.method.LinkMovementMethod;

import android.text.style.ClickableSpan;
@@ -166,7 +168,7 @@ public class CyanogenSettingsPage extends SetupPage { 
        final int playServicesAvailable = GooglePlayServicesUtil

                .isGooglePlayServicesAvailable(context);

        return playServicesAvailable != ConnectionResult.SUCCESS

                || (SetupWizardUtils.isGSMPhone(context) && SetupWizardUtils.isSimMissing(context));

                || (SetupWizardUtils.hasTelephony(context) && SetupWizardUtils.isSimMissing(context));

    }



    public static class CyanogenSettingsFragment extends SetupPageFragment {
@@ -216,8 +218,8 @@ public class CyanogenSettingsPage extends SetupPage { 
        @Override

        protected void initializePage() {

            String privacy_policy = getString(R.string.services_privacy_policy);

            String summary = getString(R.string.services_explanation, privacy_policy);

            SpannableString ss = new SpannableString(summary);

            String policySummary = getString(R.string.services_explanation, privacy_policy);

            SpannableString ss = new SpannableString(policySummary);

            ClickableSpan clickableSpan = new ClickableSpan() {

                @Override

                public void onClick(View textView) {
@@ -227,19 +229,30 @@ public class CyanogenSettingsPage extends SetupPage { 
                }

            };

            ss.setSpan(clickableSpan,

                    summary.length() - privacy_policy.length() - 1,

                    summary.length() - 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

            TextView textView = (TextView) mRootView.findViewById(R.id.privacy_policy);

            textView.setMovementMethod(LinkMovementMethod.getInstance());

            textView.setText(ss);

                    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);



            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);

            boolean metricsChecked =

                    !mPage.getData().containsKey(KEY_SEND_METRICS) || mPage.getData()

                            .getBoolean(KEY_SEND_METRICS);

            mMetrics.setChecked(metricsChecked);

            mPage.getData().putBoolean(KEY_SEND_METRICS, metricsChecked);



            mNavKeysRow = mRootView.findViewById(R.id.nav_keys);

            mNavKeysRow.setOnClickListener(mNavKeysClickListener);

            mNavKeys = (CheckBox) mRootView.findViewById(R.id.nav_keys_checkbox);
@@ -256,8 +269,18 @@ public class CyanogenSettingsPage extends SetupPage { 
                        isKeyDisablerActive();

                mNavKeys.setChecked(navKeysDisabled);

            }



            mSecureSmsRow = mRootView.findViewById(R.id.secure_sms);

            mSecureSmsRow.setOnClickListener(mSecureSmsClickListener);

            String useSecureSms = getString(R.string.services_use_secure_sms);

            String secureSmsSummary = getString(R.string.services_secure_sms_label,

                    useSecureSms, getString(R.string.os_name));

            final SpannableStringBuilder secureSmsSpan =

                    new SpannableStringBuilder(secureSmsSummary);

            secureSmsSpan.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),

                    0, useSecureSms.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);

            TextView secureSms = (TextView) mRootView.findViewById(R.id.secure_sms_summary);

            secureSms.setText(secureSmsSpan);

            if (hideWhisperPush(getActivity())) {

                mSecureSmsRow.setVisibility(View.GONE);

            }