SetupWizard: Add Cyanogen services page (48ca24eb) · Commits · e / os / android_packages_apps_SetupWizard

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_MODULE_TAGS := optional

		LOCAL_PACKAGE_NAME := CMSetupWizard
		LOCAL_PACKAGE_NAME := CyanogenSetupWizard
		LOCAL_CERTIFICATE := platform
		LOCAL_PRIVILEGED_MODULE := true

AndroidManifest.xml

+19 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.cyanogenmod.setupwizard"
		android:versionCode="3">
		android:versionCode="3"
		android:sharedUserId="android.uid.system">

		<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
		<uses-permission android:name="android.permission.STATUS_BAR" />
		@@ -39,6 +40,21 @@
		<uses-permission android:name="android.permission.ACCESS_THEME_MANAGER"/>
		<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
		<uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />
		<uses-permission android:name="org.whispersystems.whisperpush.permissions.REGISTER" />

		<permission
		android:name="cyanogenmod.permission.PROTECTED_APP"
		android:protectionLevel="signatureOrSystem" />

		<permission
		android:name="cyanogenmod.permission.FINISH_SETUP"
		android:protectionLevel="signatureOrSystem" />

		<permission android:name="org.whispersystems.whisperpush.permissions.REGISTER"
		android:protectionLevel="signature" />

		<protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
		android:permission="cyanogenmod.permission.FINISH_SETUP"/>

		<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />

		@@ -47,6 +63,8 @@
		android:theme="@style/Theme.Setup"
		android:name=".SetupWizardApp">

		<uses-library android:name="org.cyanogenmod.hardware" android:required="false" />

		<meta-data android:name="com.google.android.gms.version"
		android:value="@integer/google_play_services_version" />

res/layout/setup_cyanogen_services.xml

0 → 100644

+146 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2015 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.
		-->
		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fillViewport="true">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		style="@style/PageContent">

		<!-- The caption about privacy policy -->
		<TextView
		android:id="@+id/privacy_policy"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="15sp"
		android:layout_marginBottom="@dimen/summary_margin_bottom"
		style="@style/PageSummaryText"
		android:text="@string/services_explanation"
		android:clickable="true"/>

		<!-- Whether or not to enable metrics -->
		<LinearLayout
		android:id="@+id/metrics"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/location_margin_left"
		android:layout_marginRight="@dimen/content_margin_right"
		android:background="?android:attr/selectableItemBackground"
		android:clickable="true">


		<CheckBox
		android:id="@+id/enable_metrics_checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:layout_marginTop="5dp"
		android:duplicateParentState="true"
		android:clickable="false"/>

		<TextView
		android:id="@+id/enable_metrics_summary"
		android:layout_width="0px"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:textSize="15sp"
		android:gravity="top"
		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" />

		</LinearLayout>

		<!-- Checkbox for using on-screen nav keys -->
		<LinearLayout
		android:id="@+id/nav_keys"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/location_margin_left"
		android:layout_marginRight="@dimen/content_margin_right"
		android:background="?android:attr/selectableItemBackground"
		android:clickable="true">

		<CheckBox
		android:id="@+id/nav_keys_checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:layout_marginTop="5dp"
		android:duplicateParentState="true"
		android:clickable="false" />


		<TextView
		android:id="@+id/nav_keys_summary"
		android:layout_width="0px"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:textSize="15sp"
		android:gravity="top"
		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" />

		</LinearLayout>

		<!-- Checkbox for enabling secure SMS -->
		<LinearLayout
		android:id="@+id/secure_sms"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/location_margin_left"
		android:layout_marginRight="@dimen/content_margin_right"
		android:background="?android:attr/selectableItemBackground"
		android:clickable="true">

		<CheckBox
		android:id="@+id/secure_sms_checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:layout_marginTop="5dp"
		android:duplicateParentState="true"
		android:clickable="false" />

		<TextView
		android:id="@+id/secure_sms_summary"
		android:layout_width="0px"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:textSize="15sp"
		android:gravity="top"
		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" />

		</LinearLayout>
		</LinearLayout>
		</ScrollView>

res/values/strings.xml

+8 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		<string name="location_services_summary">Location services allows Maps and other apps to gather and use data such as your approximate location. For example, Maps may use your approximate location to locate nearby coffee shops.</string>
		<string name="location_access_summary">Allow apps that have asked your permission to use your location information. This may include your current location and past locations.</string>
		<string name="location_gps">Improve location accuracy by allowing apps to use the GPS on your phone.</string>
		<string name="location_network">Use Google’s location service to help apps determine your location. This means sending annonymous location data to Google, even when no apps are running.</string>
		<string name="location_network">Use Google\'s location service 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_no_service">No service</string>
		@@ -63,4 +63,11 @@
		<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="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_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_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>
		</resources>

src/com/cyanogenmod/setupwizard/SetupWizardApp.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ public class SetupWizardApp extends Application {
		// Leave this off for release
		public static final boolean DEBUG = false;

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