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

Commit dc8c56ba authored by cretin45's avatar cretin45
Browse files

SetupWizard: Separate the CM services and settings page 

Change-Id: Ia51404ea75cbf5a9219f354412ecb34edbb08958
parent 59730c2e

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

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ public class CMSetupWizardData extends AbstractSetupData { 
            pages.add(new GmsAccountPage(mContext, this));

        }

        pages.add(new CyanogenServicesPage(mContext, this));

        pages.add(new CyanogenSettingsPage(mContext, this));

        pages.add(new LocationSettingsPage(mContext, this));

        pages.add(new DateTimePage(mContext, this));

        pages.add(new FinishPage(mContext, this));

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

+47 −239
Original line number Diff line number Diff line
@@ -27,44 +27,17 @@ import android.app.Fragment; 
import android.app.FragmentManager;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.os.Bundle;

import android.os.Handler;

import android.os.RemoteException;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.method.LinkMovementMethod;

import android.text.style.ClickableSpan;

import android.view.IWindowManager;

import android.view.View;

import android.view.WindowManagerGlobal;

import android.widget.CheckBox;

import android.widget.TextView;



import com.cyanogenmod.setupwizard.R;

import com.cyanogenmod.setupwizard.SetupWizardApp;

import com.cyanogenmod.setupwizard.ui.SetupPageFragment;

import com.cyanogenmod.setupwizard.ui.WebViewDialogFragment;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;



import com.google.android.gms.common.ConnectionResult;

import com.google.android.gms.common.GooglePlayServicesUtil;



import org.cyanogenmod.hardware.KeyDisabler;



import java.io.IOException;



public class CyanogenServicesPage extends SetupPage {



    public static final String TAG = "CyanogenServicesPage";



    public static final String KEY_SEND_METRICS = "send_metrics";

    public static final String KEY_REGISTER_WHISPERPUSH = "register";



    public static final String SETTING_METRICS = "settings.cyanogen.allow_metrics";

    public static final String PRIVACY_POLICY_URI = "https://cyngn.com/legal/privacy-policy";

    public static final String TAG = "CyangogenServicesPage";



    public CyanogenServicesPage(Context context, SetupDataCallbacks callbacks) {

        super(context, callbacks);
@@ -77,7 +50,7 @@ public class CyanogenServicesPage extends SetupPage { 
            Bundle args = new Bundle();

            args.putString(Page.KEY_PAGE_ARGUMENT, getKey());

            args.putInt(Page.KEY_PAGE_ACTION, action);

            fragment = new CyanogenServicesFragment();

            fragment = new LoadingFragment();

            fragment.setArguments(args);

        }

        return fragment;
@@ -90,202 +63,39 @@ public class CyanogenServicesPage extends SetupPage { 


    @Override

    public int getTitleResId() {

        return R.string.setup_services;

        return R.string.loading;

    }



    @Override

    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN) {

           if (resultCode == Activity.RESULT_CANCELED) {

               getCallbacks().onPreviousPage();

           }

        }

        return true;

    }



    private static void writeDisableNavkeysOption(Context context, boolean enabled) {

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        final int defaultBrightness = context.getResources().getInteger(

                com.android.internal.R.integer.config_buttonBrightnessSettingDefault);



        Settings.System.putInt(context.getContentResolver(),

                Settings.System.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);

        KeyDisabler.setActive(enabled);



        /* Save/restore button timeouts to disable them in softkey mode */

        SharedPreferences.Editor editor = prefs.edit();



        if (enabled) {

            int currentBrightness = Settings.System.getInt(context.getContentResolver(),

                    Settings.System.BUTTON_BRIGHTNESS, defaultBrightness);

            if (!prefs.contains("pre_navbar_button_backlight")) {

                editor.putInt("pre_navbar_button_backlight", currentBrightness);

            }

            Settings.System.putInt(context.getContentResolver(),

                    Settings.System.BUTTON_BRIGHTNESS, 0);

        } else {

            int oldBright = prefs.getInt("pre_navbar_button_backlight", -1);

            if (oldBright != -1) {

                Settings.System.putInt(context.getContentResolver(),

                        Settings.System.BUTTON_BRIGHTNESS, oldBright);

                editor.remove("pre_navbar_button_backlight");

            }

        }

        editor.commit();

    }



    private static boolean hideKeyDisabler() {

        try {

            return !KeyDisabler.isSupported();

        } catch (NoClassDefFoundError e) {

            // Hardware abstraction framework not installed

            return true;

        }

    public int getNextButtonTitleResId() {

        return R.string.skip;

    }



    private static boolean hideWhisperPush(Context context) {

        final int playServicesAvailable = GooglePlayServicesUtil

                .isGooglePlayServicesAvailable(context);

        return playServicesAvailable != ConnectionResult.SUCCESS

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

    }



    public static class CyanogenServicesFragment extends SetupPageFragment {



        private View mMetricsRow;

        private View mNavKeysRow;

        private View mSecureSmsRow;

        private CheckBox mMetrics;

        private CheckBox mNavKeys;

        private CheckBox mSecureSms;



        private Handler mHandler;





        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 mNavKeysClickListener = new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                mNavKeys.setEnabled(false);

                boolean checked = !mNavKeys.isChecked();

                writeDisableNavkeysOption(getActivity(), checked);

                updateDisableNavkeysOption();

                mHandler.postDelayed(new Runnable() {

                    @Override

                    public void run() {

                        mNavKeys.setEnabled(true);

                    }

                }, 1000);

            }

        };



        private View.OnClickListener mSecureSmsClickListener = new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                boolean checked = !mSecureSms.isChecked();

                mSecureSms.setChecked(checked);

                mPage.getData().putBoolean(KEY_REGISTER_WHISPERPUSH, checked);

            }

        };



         public CyanogenServicesFragment() {

             super();

             mHandler = new Handler();

         }



        @Override

        public void onActivityCreated(Bundle savedInstanceState) {

            super.onActivityCreated(savedInstanceState);

            final Activity activity = getActivity();

            activity.getWindow().setStatusBarColor(getResources().getColor(R.color.primary_dark));

            int action = getArguments().getInt(Page.KEY_PAGE_ACTION);

            if (savedInstanceState == null && !SetupWizardUtils.accountExists(activity,

                    activity.getString(R.string.cm_account_type)) && action == Page.ACTION_NEXT) {

                 launchCyanogenAccountSetup(activity);

    public void doLoadAction(Activity context, int action) {

        if (action == Page.ACTION_PREVIOUS) {

            getCallbacks().onPreviousPage();

        } else {

            launchCyanogenAccountSetup(context);

            super.doLoadAction(context, action);

        }

    }



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

            ClickableSpan clickableSpan = new ClickableSpan() {

                @Override

                public void onClick(View textView) {

                    WebViewDialogFragment.newInstance()

                            .setUri(PRIVACY_POLICY_URI)

                            .show(getActivity().getFragmentManager(), WebViewDialogFragment.TAG);

                }

            };

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

            mMetricsRow = mRootView.findViewById(R.id.metrics);

            mMetricsRow.setOnClickListener(mMetricsClickListener);

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

            boolean needsNavBar = true;

            try {

                IWindowManager windowManager = WindowManagerGlobal.getWindowManagerService();

                needsNavBar = windowManager.needsNavigationBar();

            } catch (RemoteException e) {

            }

            if (hideKeyDisabler() || needsNavBar) {

                mNavKeysRow.setVisibility(View.GONE);

            } else {

                boolean navKeysDisabled =

                        KeyDisabler.isActive();

                mNavKeys.setChecked(navKeysDisabled);

            }

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

            mSecureSmsRow.setOnClickListener(mSecureSmsClickListener);

            if (hideWhisperPush(getActivity())) {

                mSecureSmsRow.setVisibility(View.GONE);

    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN) {

            if (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_FIRST_USER) {

                if (SetupWizardUtils.accountExists(mContext, mContext.getString(R.string.cm_account_type))) {

                    setCompleted(true);

                }

            mSecureSms = (CheckBox) mRootView.findViewById(R.id.secure_sms_checkbox);

            boolean smsChecked = mPage.getData().containsKey(KEY_REGISTER_WHISPERPUSH) ?

                    mPage.getData().getBoolean(KEY_REGISTER_WHISPERPUSH) :

                            false;

            mSecureSms.setChecked(smsChecked);

            mPage.getData().putBoolean(KEY_REGISTER_WHISPERPUSH, smsChecked);

                getCallbacks().onNextPage();

            } else if (resultCode == Activity.RESULT_CANCELED) {

                getCallbacks().onPreviousPage();

            }



        @Override

        protected int getLayoutResource() {

            return R.layout.setup_cyanogen_services;

        }



        @Override

        public void onResume() {

            super.onResume();

            updateDisableNavkeysOption();

        return true;

    }



        private void updateDisableNavkeysOption() {

            boolean enabled = Settings.System.getInt(getActivity().getContentResolver(),

                    Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) != 0;



            mNavKeys.setChecked(enabled);

        }



    private void launchCyanogenAccountSetup(final Activity activity) {

        Bundle bundle = new Bundle();
@@ -314,6 +124,4 @@ public class CyanogenServicesPage extends SetupPage { 
                            }

                        }, null);

    }



    }

}

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

0 → 100644
+278 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The CyanogenMod Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.cyanogenmod.setupwizard.setup;



import android.app.Activity;

import android.app.Fragment;

import android.app.FragmentManager;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.os.Bundle;

import android.os.Handler;

import android.os.RemoteException;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.text.SpannableString;

import android.text.Spanned;

import android.text.method.LinkMovementMethod;

import android.text.style.ClickableSpan;

import android.view.IWindowManager;

import android.view.View;

import android.view.WindowManagerGlobal;

import android.widget.CheckBox;

import android.widget.TextView;



import com.cyanogenmod.setupwizard.R;

import com.cyanogenmod.setupwizard.SetupWizardApp;

import com.cyanogenmod.setupwizard.ui.SetupPageFragment;

import com.cyanogenmod.setupwizard.ui.WebViewDialogFragment;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;



import com.google.android.gms.common.ConnectionResult;

import com.google.android.gms.common.GooglePlayServicesUtil;



import org.cyanogenmod.hardware.KeyDisabler;



public class CyanogenSettingsPage extends SetupPage {



    public static final String TAG = "CyanogenServicesPage";



    public static final String KEY_SEND_METRICS = "send_metrics";

    public static final String KEY_REGISTER_WHISPERPUSH = "register";



    public static final String SETTING_METRICS = "settings.cyanogen.allow_metrics";

    public static final String PRIVACY_POLICY_URI = "https://cyngn.com/legal/privacy-policy";



    public CyanogenSettingsPage(Context context, SetupDataCallbacks callbacks) {

        super(context, callbacks);

    }



    @Override

    public Fragment getFragment(FragmentManager fragmentManager, int action) {

        Fragment fragment = fragmentManager.findFragmentByTag(getKey());

        if (fragment == null) {

            Bundle args = new Bundle();

            args.putString(Page.KEY_PAGE_ARGUMENT, getKey());

            args.putInt(Page.KEY_PAGE_ACTION, action);

            fragment = new CyanogenSettingsFragment();

            fragment.setArguments(args);

        }

        return fragment;

    }



    @Override

    public String getKey() {

        return TAG;

    }



    @Override

    public int getTitleResId() {

        return R.string.setup_services;

    }



    @Override

    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN) {

            if (resultCode == Activity.RESULT_CANCELED) {

                getCallbacks().onPreviousPage();

            }

        }

        return true;

    }



    private static void writeDisableNavkeysOption(Context context, boolean enabled) {

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        final int defaultBrightness = context.getResources().getInteger(

                com.android.internal.R.integer.config_buttonBrightnessSettingDefault);



        Settings.System.putInt(context.getContentResolver(),

                Settings.System.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);

        KeyDisabler.setActive(enabled);



        /* Save/restore button timeouts to disable them in softkey mode */

        SharedPreferences.Editor editor = prefs.edit();



        if (enabled) {

            int currentBrightness = Settings.System.getInt(context.getContentResolver(),

                    Settings.System.BUTTON_BRIGHTNESS, defaultBrightness);

            if (!prefs.contains("pre_navbar_button_backlight")) {

                editor.putInt("pre_navbar_button_backlight", currentBrightness);

            }

            Settings.System.putInt(context.getContentResolver(),

                    Settings.System.BUTTON_BRIGHTNESS, 0);

        } else {

            int oldBright = prefs.getInt("pre_navbar_button_backlight", -1);

            if (oldBright != -1) {

                Settings.System.putInt(context.getContentResolver(),

                        Settings.System.BUTTON_BRIGHTNESS, oldBright);

                editor.remove("pre_navbar_button_backlight");

            }

        }

        editor.commit();

    }



    private static boolean hideKeyDisabler() {

        try {

            return !KeyDisabler.isSupported();

        } catch (NoClassDefFoundError e) {

            // Hardware abstraction framework not installed

            return true;

        }

    }



    private static boolean hideWhisperPush(Context context) {

        final int playServicesAvailable = GooglePlayServicesUtil

                .isGooglePlayServicesAvailable(context);

        return playServicesAvailable != ConnectionResult.SUCCESS

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

    }



    public static class CyanogenSettingsFragment extends SetupPageFragment {



        private View mMetricsRow;

        private View mNavKeysRow;

        private View mSecureSmsRow;

        private CheckBox mMetrics;

        private CheckBox mNavKeys;

        private CheckBox mSecureSms;



        private Handler mHandler;





        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 mNavKeysClickListener = new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                mNavKeys.setEnabled(false);

                boolean checked = !mNavKeys.isChecked();

                writeDisableNavkeysOption(getActivity(), checked);

                updateDisableNavkeysOption();

                mHandler.postDelayed(new Runnable() {

                    @Override

                    public void run() {

                        mNavKeys.setEnabled(true);

                    }

                }, 1000);

            }

        };



        private View.OnClickListener mSecureSmsClickListener = new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                boolean checked = !mSecureSms.isChecked();

                mSecureSms.setChecked(checked);

                mPage.getData().putBoolean(KEY_REGISTER_WHISPERPUSH, checked);

            }

        };



        public CyanogenSettingsFragment() {

            super();

            mHandler = new Handler();

        }



        @Override

        public void onActivityCreated(Bundle savedInstanceState) {

            super.onActivityCreated(savedInstanceState);

            final Activity activity = getActivity();

            activity.getWindow().setStatusBarColor(getResources().getColor(R.color.primary_dark));

        }



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

            ClickableSpan clickableSpan = new ClickableSpan() {

                @Override

                public void onClick(View textView) {

                    WebViewDialogFragment.newInstance()

                            .setUri(PRIVACY_POLICY_URI)

                            .show(getActivity().getFragmentManager(), WebViewDialogFragment.TAG);

                }

            };

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

            mMetricsRow = mRootView.findViewById(R.id.metrics);

            mMetricsRow.setOnClickListener(mMetricsClickListener);

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

            boolean needsNavBar = true;

            try {

                IWindowManager windowManager = WindowManagerGlobal.getWindowManagerService();

                needsNavBar = windowManager.needsNavigationBar();

            } catch (RemoteException e) {

            }

            if (hideKeyDisabler() || needsNavBar) {

                mNavKeysRow.setVisibility(View.GONE);

            } else {

                boolean navKeysDisabled =

                        KeyDisabler.isActive();

                mNavKeys.setChecked(navKeysDisabled);

            }

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

            mSecureSmsRow.setOnClickListener(mSecureSmsClickListener);

            if (hideWhisperPush(getActivity())) {

                mSecureSmsRow.setVisibility(View.GONE);

            }

            mSecureSms = (CheckBox) mRootView.findViewById(R.id.secure_sms_checkbox);

            boolean smsChecked = mPage.getData().containsKey(KEY_REGISTER_WHISPERPUSH) ?

                    mPage.getData().getBoolean(KEY_REGISTER_WHISPERPUSH) :

                    false;

            mSecureSms.setChecked(smsChecked);

            mPage.getData().putBoolean(KEY_REGISTER_WHISPERPUSH, smsChecked);

        }



        @Override

        protected int getLayoutResource() {

            return R.layout.setup_cyanogen_services;

        }



        @Override

        public void onResume() {

            super.onResume();

            updateDisableNavkeysOption();

        }



        private void updateDisableNavkeysOption() {

            boolean enabled = Settings.System.getInt(getActivity().getContentResolver(),

                    Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) != 0;



            mNavKeys.setChecked(enabled);

        }



    }

}

src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java

+5 −8

File changed.

Preview size limit exceeded, changes collapsed.