SetupWizard: Add privacy policy popup (8913799a) · Commits · e / os / android_packages_apps_SetupWizard

res/layout/terms_webview.xml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		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.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<View
		android:layout_height="match_parent"
		android:layout_width="match_parent"
		android:layout_weight="1" />
		</LinearLayout>

		<WebView
		android:id="@+id/webview"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />
		</FrameLayout>

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@
		<string name="app_name">Setup Wizard</string>
		<string name="product_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>

res/values/styles.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		<item name="android:windowContentTransitions">true</item>
		<item name="android:windowExitTransition">@android:transition/explode</item>
		<item name="android:colorPrimary">@color/primary</item>
		<item name="android:colorPrimaryDark">#00000000</item>
		<item name="android:colorPrimaryDark">@color/primary</item>
		<item name="android:colorAccent">@color/accent</item>
		</style>

src/com/cyanogenmod/setupwizard/SetupWizardApp.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ public class SetupWizardApp extends Application {

		public static final String ACTION_FINISHED = "com.cyanogenmod.setupwizard.SETUP_FINISHED";

		public static final String ACCOUNT_TYPE_CYANOGEN = "com.cyanogen";
		public static final String ACCOUNT_TYPE_GMS = "com.google";

		public static final String ACTION_SETUP_WIFI = "com.android.net.wifi.SETUP_WIFI_NETWORK";
		@@ -37,6 +36,7 @@ public class SetupWizardApp extends Application {
		public static final String EXTRA_FIRST_RUN = "firstRun";
		public static final String EXTRA_ALLOW_SKIP = "allowSkip";
		public static final String EXTRA_AUTO_FINISH = "wifi_auto_finish_on_connect";
		public static final String EXTRA_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";

		public static final int REQUEST_CODE_SETUP_WIFI = 0;

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

+12 −6

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ 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;
		@@ -54,6 +55,7 @@ public class CyanogenServicesPage extends SetupPage {
		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 CyanogenServicesPage(Context context, SetupDataCallbacks callbacks) {
		super(context, callbacks);
		@@ -180,10 +182,11 @@ public class CyanogenServicesPage extends SetupPage {
		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.primary_dark));
		if (!SetupWizardUtils.accountExists(getActivity(),
		SetupWizardApp.ACCOUNT_TYPE_CYANOGEN)) {
		launchCyanogenAccountSetup(getActivity());
		final Activity activity = getActivity();
		activity.getWindow().setStatusBarColor(getResources().getColor(R.color.primary_dark));
		if (!SetupWizardUtils.accountExists(activity,
		activity.getString(R.string.cm_account_type))) {
		launchCyanogenAccountSetup(activity);
		}
		}

		@@ -195,7 +198,9 @@ public class CyanogenServicesPage extends SetupPage {
		ClickableSpan clickableSpan = new ClickableSpan() {
		@Override
		public void onClick(View textView) {
		//TDB privacy policy
		WebViewDialogFragment.newInstance()
		.setUri(PRIVACY_POLICY_URI)
		.show(getActivity().getFragmentManager(), WebViewDialogFragment.TAG);
		}
		};
		ss.setSpan(clickableSpan,
		@@ -262,8 +267,9 @@ public class CyanogenServicesPage extends SetupPage {
		private void launchCyanogenAccountSetup(final Activity activity) {
		Bundle bundle = new Bundle();
		bundle.putBoolean(SetupWizardApp.EXTRA_FIRST_RUN, true);
		bundle.putBoolean(SetupWizardApp.EXTRA_SHOW_BUTTON_BAR, true);
		AccountManager.get(activity)
		.addAccount(SetupWizardApp.ACCOUNT_TYPE_CYANOGEN, null, null, bundle,
		.addAccount(activity.getString(R.string.cm_account_type), null, null, bundle,
		activity, null, null);
		}