summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rwxr-xr-xres/drawable-hdpi/cross.pngbin0 -> 346 bytes
-rwxr-xr-xres/drawable-hdpi/tick.pngbin0 -> 312 bytes
-rwxr-xr-xres/drawable-mdpi/cross.pngbin0 -> 253 bytes
-rwxr-xr-xres/drawable-mdpi/tick.pngbin0 -> 236 bytes
-rwxr-xr-xres/drawable-xhdpi/cross.pngbin0 -> 422 bytes
-rwxr-xr-xres/drawable-xhdpi/tick.pngbin0 -> 371 bytes
-rwxr-xr-xres/drawable-xxhdpi/cross.pngbin0 -> 554 bytes
-rwxr-xr-xres/drawable-xxhdpi/tick.pngbin0 -> 477 bytes
-rwxr-xr-xres/drawable-xxxhdpi/cross.pngbin0 -> 692 bytes
-rwxr-xr-xres/drawable-xxxhdpi/tick.pngbin0 -> 572 bytes
-rw-r--r--res/layout/setup_cyanogen_services.xml52
-rw-r--r--res/values/strings.xml6
12 files changed, 58 insertions, 0 deletions
diff --git a/res/drawable-hdpi/cross.png b/res/drawable-hdpi/cross.png
new file mode 100755
index 0000000..ad8e5d9
--- /dev/null
+++ b/res/drawable-hdpi/cross.png
Binary files differ
diff --git a/res/drawable-hdpi/tick.png b/res/drawable-hdpi/tick.png
new file mode 100755
index 0000000..1564a5b
--- /dev/null
+++ b/res/drawable-hdpi/tick.png
Binary files differ
diff --git a/res/drawable-mdpi/cross.png b/res/drawable-mdpi/cross.png
new file mode 100755
index 0000000..a5bca90
--- /dev/null
+++ b/res/drawable-mdpi/cross.png
Binary files differ
diff --git a/res/drawable-mdpi/tick.png b/res/drawable-mdpi/tick.png
new file mode 100755
index 0000000..779b159
--- /dev/null
+++ b/res/drawable-mdpi/tick.png
Binary files differ
diff --git a/res/drawable-xhdpi/cross.png b/res/drawable-xhdpi/cross.png
new file mode 100755
index 0000000..d5cac0a
--- /dev/null
+++ b/res/drawable-xhdpi/cross.png
Binary files differ
diff --git a/res/drawable-xhdpi/tick.png b/res/drawable-xhdpi/tick.png
new file mode 100755
index 0000000..0e10e6d
--- /dev/null
+++ b/res/drawable-xhdpi/tick.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cross.png b/res/drawable-xxhdpi/cross.png
new file mode 100755
index 0000000..9c47e16
--- /dev/null
+++ b/res/drawable-xxhdpi/cross.png
Binary files differ
diff --git a/res/drawable-xxhdpi/tick.png b/res/drawable-xxhdpi/tick.png
new file mode 100755
index 0000000..f398a15
--- /dev/null
+++ b/res/drawable-xxhdpi/tick.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/cross.png b/res/drawable-xxxhdpi/cross.png
new file mode 100755
index 0000000..0a2800d
--- /dev/null
+++ b/res/drawable-xxxhdpi/cross.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/tick.png b/res/drawable-xxxhdpi/tick.png
new file mode 100755
index 0000000..050fa9f
--- /dev/null
+++ b/res/drawable-xxxhdpi/tick.png
Binary files differ
diff --git a/res/layout/setup_cyanogen_services.xml b/res/layout/setup_cyanogen_services.xml
index ba16627..36837bb 100644
--- a/res/layout/setup_cyanogen_services.xml
+++ b/res/layout/setup_cyanogen_services.xml
@@ -50,6 +50,58 @@
android:text="@string/services_explanation"
android:clickable="true"/>
+ <LinearLayout
+ android:id="@+id/killswitch"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
+ android:background="?android:attr/selectableItemBackground">
+
+
+ <ImageView
+ android:id="@+id/killswitch_check"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="@dimen/location_text_margin_left"
+ android:layout_gravity="center|top"
+ android:src="@drawable/tick"/>
+
+ <RelativeLayout
+ android:layout_width="0px"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ 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">
+
+ <TextView
+ android:id="@+id/killswitch_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="15sp"
+ android:lineSpacingExtra="@dimen/setup_line_spacing"
+ android:fadingEdge="horizontal"
+ android:text="@string/setup_require_cyanogen_label"/>
+
+ <TextView
+ android:id="@+id/killswitch_summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/killswitch_title"
+ android:layout_alignStart="@+id/killswitch_title"
+ android:textSize="15sp"
+ android:lineSpacingExtra="@dimen/setup_line_spacing"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/setup_device_locked_instructions"/>
+ </RelativeLayout>
+
+ </LinearLayout>
+
<!-- Whether or not to enable metrics -->
<LinearLayout
android:id="@+id/metrics"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a106be..2607b9b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,4 +79,10 @@
<string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</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>
+
+ <string name="setup_unlock">Unlock</string>
+ <string name="setup_device_locked">This device has been locked by the user.</string>
+ <string name="setup_require_cyanogen_label"><b>Require your Cyanogen OS account password</b> in order to use your device even after a factory reset.</string>
+ <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string>
+ <string name="setup_warning_skip_anyway">Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost</string>
</resources>