Automatic translation import

Change-Id: Iac21213470d24006465d51692f44c6d8e66f66b2

Android.mk

@@ -14,20 +14,18 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
-    play \
     libphonenumber \
+    org.cyanogenmod.platform.internal \
     org.cyanogenmod.platform.sdk
 
-LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_JAVA_LIBRARIES := \
+    telephony-common
 
-# Include res dir from chips
-google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res
-res_dir := $(google_play_dir) res
-
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms
 
 include frameworks/opt/setupwizard/library/common.mk
 
 include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))

AndroidManifest.xml

@@ -63,15 +63,12 @@
     <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />
 
     <application android:label="@string/app_name"
-                 android:icon="@drawable/icon"
+                 android:icon="@mipmap/ic_launcher"
                  android:theme="@style/Theme.Setup"
                  android:uiOptions="none"
                  android:taskAffinity="com.android.wizard"
                  android:name=".SetupWizardApp">
 
-        <meta-data android:name="com.google.android.gms.version"
-                   android:value="@integer/google_play_services_version" />
-
         <activity android:name=".ui.SetupWizardActivity"
                   android:label="@string/product_name"
                   android:launchMode="singleInstance"

proguard.flags

@@ -2,18 +2,6 @@
     protected Object[][] getContents();
 }
 
-# Keep SafeParcelable value, needed for reflection. This is required to support backwards
-# compatibility of some classes.
--keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
-    public static final *** NULL;
-}
-
-# Keep the names of classes/members we need for client functionality.
--keepnames @com.google.android.gms.common.annotation.KeepName class *
--keepclassmembernames class * {
-    @com.google.android.gms.common.annotation.KeepName *;
-}
-
 # Needed for Parcelable/SafeParcelable Creators to not get stripped
 -keepnames class * implements android.os.Parcelable {
     public static final ** CREATOR;
@@ -22,4 +10,3 @@
 # Needed when building against the Marshmallow SDK
 -dontwarn org.apache.http.**
 -dontwarn android.support.**
--dontwarn com.google.android.gms.**

res/anim/slide_left.xml

@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator android:duration="@android:integer/config_mediumAnimTime"
-                    android:interpolator="@android:anim/accelerate_interpolator"
-                    android:propertyName="x"
-                    android:valueFrom="1280"
-                    android:valueTo="0"
-                    android:valueType="floatType"/>
-</set>
+<!--
+    Copyright (C) 2015 The Android Open Source 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="0%"
+    android:toXDelta="-100%"
+    android:interpolator="@android:anim/decelerate_interpolator" />

res/anim/slide_right.xml

@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator android:duration="@android:integer/config_mediumAnimTime"
-                    android:interpolator="@android:anim/accelerate_interpolator"
-                    android:propertyName="x"
-                    android:valueFrom="0"
-                    android:valueTo="-1280"
-                    android:valueType="floatType"/>
-</set>
+<!--
+    Copyright (C) 2015 The Android Open Source 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="-100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator" />

res/drawable/cross.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
+19 19 17.59 13.41 12z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/drawable/ic_check_mark.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (c) 2015 The CyanogenMod Project
+    Copyright (c) 2017 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,6 +22,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#7ED321"
+        android:fillColor="@color/accent"
         android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
 </vector>

res/drawable/ic_chevron_left_wht.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M15.41,7.41L14,6l-6,6l6,6l1.41-1.41L10.83,12L15.41,7.41Z" />
-</vector>

res/drawable/ic_chevron_right_wht.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M10,6L8.59,7.41L13.17,12l-4.58,4.59L10,18l6-6L10,6Z" />
-</vector>

res/drawable/ic_datetime.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2 2h14c1.1 0
+2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z" />
+</vector>

res/drawable/ic_features.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0V0z" />
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M11.8 12.5v-1l1.1-.8c.1-.1 .1 -.2 .1 -.3l-1-1.7c-.1-.1-.2-.2-.3-.1l-1.3 .4
+c-.3-.2-.6-.4-.9-.5l-.2-1.3c0-.1-.1-.2-.3-.2H7c-.1 0-.2 .1 -.3 .2 l-.2 1.3c-.3
+.1 -.6 .3 -.9 .5 l-1.3-.5c-.1 0-.2 0-.3 .1 l-1 1.7c-.1 .1 0 .2 .1 .3l1.1 .8
+v1l-1.1 .8 c-.1 .2 -.1 .3 -.1 .4 l1 1.7c.1 .1 .2 .2 .3 .1 l1.4-.4c.3 .2 .6 .4 .9
+.5 l.2 1.3c-.1 .1 .1 .2 .2 .2 h2c.1 0 .2-.1 .3 -.2l.2-1.3c.3-.1 .6 -.3 .9
+-.5l1.3 .5 c.1 0 .2 0 .3-.1l1-1.7c.1-.1 0-.2-.1-.3l-1.1-.9zM8 14c-1.1
+0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM19 1H9c-1.1 0-2 .9-2
+2v3h2V4h10v16H9v-2H7v3c0 1.1 .9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2z" />
+</vector>

res/drawable/ic_fingerprint.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M17.81 4.47c-.08 0-.16-.02-.23-.06C15.66 3.42 14 3 12.01 3c-1.98 0-3.86 .47
+-5.57 1.41-.24 .13 -.54 .04 -.68-.2-.13-.24-.04-.55 .2 -.68C7.82 2.52 9.86 2
+12.01 2c2.13 0 3.99 .47 6.03 1.52 .25 .13 .34 .43 .21 .67-.09 .18 -.26 .28 -.44
+.28 zM3.5 9.72c-.1 0-.2-.03-.29-.09-.23-.16-.28-.47-.12-.7 .99 -1.4 2.25-2.5
+3.75-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5 .77 2.76 1.86 3.75 3.25 .16 .22 .11
+.54-.12 .7 -.23 .16 -.54 .11
+-.7-.12-.9-1.26-2.04-2.25-3.39-2.94-2.87-1.47-6.54-1.47-9.4 .01 -1.36 .7 -2.5
+1.7-3.4 2.96-.08 .14 -.23 .21 -.39 .21 zm6.25 12.07c-.13
+0-.26-.05-.35-.15-.87-.87-1.34-1.43-2.01-2.64-.69-1.23-1.05-2.73-1.05-4.34
+0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39c0 .28-.22 .5 -.5 .5
+s-.5-.22-.5-.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44 .32
+2.77 .93 3.85 .64 1.15 1.08 1.64 1.85 2.42 .19 .2 .19 .51 0 .71-.11 .1 -.24 .15
+-.37 .15 zm7.17-1.85c-1.19 0-2.24-.3-3.1-.89-1.49-1.01-2.38-2.65-2.38-4.39 0-.28
+.22 -.5 .5 -.5s.5 .22 .5 .5 c0 1.41 .72 2.74 1.94 3.56 .71 .48 1.54 .71 2.54 .71
+.24 0 .64-.03 1.04-.1 .27 -.05 .53 .13 .58 .41 .05 .27-.13 .53 -.41 .58 -.57 .11
+-1.07 .12 -1.21 .12 zM14.91 22c-.04
+0-.09-.01-.13-.02-1.59-.44-2.63-1.03-3.72-2.1-1.4-1.39-2.17-3.24-2.17-5.22
+0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07 .93 1.94 2.08
+1.94s2.08-.87 2.08-1.94c0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.44 1.58-6.61
+4.03-.39 .81 -.59 1.76-.59 2.8 0 .78 .07 2.01 .67 3.61 .1 .26-.03 .55 -.29 .64
+-.26 .1 -.55-.04-.64-.29-.49-1.31-.73-2.61-.73-3.96 0-1.2 .23 -2.29 .68 -3.24
+1.33-2.79 4.28-4.6 7.51-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08
+2.94s-3.08-1.32-3.08-2.94c0-1.07-.93-1.94-2.08-1.94s-2.08 .87 -2.08 1.94c0 1.71
+.66 3.31 1.87 4.51 .95 .94 1.86 1.46 3.27 1.85 .27 .07 .42 .35 .35 .61-.05 .23
+-.26 .38 -.47 .38 z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/drawable/ic_locale.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M12.87 15.07l-2.54-2.51 .03 -.03c1.74-1.94 2.98-4.17
+3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3
+9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11 .76
+-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12
+17h-3.24z" />
+</vector>

res/drawable/ic_location.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/drawable/ic_lock_screen.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1 .9 2 2
+2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9
+2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" />
+</vector>

res/drawable/ic_logo_mod_title.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Cyanogen, Inc.
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="16dp"
-    android:viewportWidth="72"
-    android:viewportHeight="16">
-
-    <path
-        android:name="ic_logo_mod_title"
-        android:fillColor="#000000"
-        android:pathData="M19.9097139,5.66053833 C19.9097139,2.54013671 17.3930434,4.53810596e-05
-14.2986968,4.53810596e-05 L0,4.53810596e-05 L0,15.9999319 L2.53412329,15.9999319
-L2.53412329,2.5567008 L8.68814203,2.5567008 L8.68814203,15.9999319
-L11.221803,15.9999319 L11.221803,2.5567008 L14.2986968,2.5567008
-C15.9954325,2.5567008 17.3755906,3.94933205 17.3755906,5.66053833
-L17.3755906,15.9999319 L19.9097139,15.9999319 L19.9097139,5.66053833 Z
-M44.8456489,7.26108291 L44.8456489,6.32158153 L44.8456489,5.66049295
-C44.8456489,2.54020478 42.3287472,0 39.2346318,0 L31.9464123,0 C28.853106,0
-26.3363199,2.54020478 26.3363199,5.66049295 L26.3363199,6.93388547
-L26.3363199,7.26108291 L26.3363199,8.73891709 L26.3363199,9.19476983
-L26.3363199,10.3393936 C26.3363199,13.4595683 28.853106,16 31.9464123,16
-L39.2346318,16 C42.3287472,16 44.8456489,13.4595683 44.8456489,10.3393936
-L44.8456489,9.71290807 L44.8456489,8.73891709 L44.8456489,7.26108291 Z
-M42.3111788,10.3393936 C42.3111788,12.0508268 40.9310208,13.4432311
-39.2346318,13.4432311 L31.9464123,13.4432311 C30.2502545,13.4432311
-28.8700964,12.0508268 28.8700964,10.3393936 L28.8700964,5.66049295
-C28.8700964,3.94928667 30.2502545,2.55676887 31.9464123,2.55676887
-L39.2346318,2.55676887 C40.9315987,2.55676887 42.3111788,3.94928667
-42.3111788,5.66049295 L42.3111788,10.3393936 Z M64.1708327,0 L51.2719428,0
-L51.2719428,16 L64.1708327,16 C67.2652948,16 69.7817342,13.4595683
-69.7817342,10.3393936 L69.7817342,5.66049295 C69.7817342,2.54020478 67.2652948,0
-64.1708327,0 Z M67.2477265,10.3393936 C67.2477265,12.0508268
-65.8674528,13.4432311 64.1708327,13.4432311 L53.8064129,13.4432311
-L53.8064129,2.55676887 L64.1708327,2.55676887 C65.8674528,2.55676887
-67.2477265,3.94928667 67.2477265,5.66049295 L67.2477265,10.3393936 Z" />
-</vector>

res/drawable/ic_mobile_data.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:fillAlpha=".3"
+        android:pathData="M2 22h20V2z" />
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M17 7L2 22h15z" />
+</vector>

res/drawable/ic_signal_0.xml

@@ -1,5 +1,6 @@
 <!--
     Copyright (C) 2014 The Android Open Source Project
+    Copyright (c) 2017 The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
         android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
 </vector>

res/drawable/ic_signal_1.xml

@@ -1,5 +1,6 @@
 <!--
     Copyright (C) 2014 The Android Open Source Project
+    Copyright (c) 2017 The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
         android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
     <path
         android:fillColor="@color/accent"

res/drawable/ic_signal_2.xml

@@ -1,5 +1,6 @@
 <!--
     Copyright (C) 2014 The Android Open Source Project
+    Copyright (c) 2017 The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
         android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
     <path
         android:fillColor="@color/accent"

res/drawable/ic_signal_3.xml

@@ -1,5 +1,6 @@
 <!--
     Copyright (C) 2014 The Android Open Source Project
+    Copyright (c) 2017 The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
         android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
     <path
         android:fillColor="@color/accent"

res/drawable/ic_signal_4.xml

@@ -1,5 +1,6 @@
 <!--
     Copyright (C) 2014 The Android Open Source Project
+    Copyright (c) 2017 The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

res/drawable/ic_signal_no_signal.xml

@@ -1,5 +1,6 @@
 <!--
     Copyright (C) 2014 The Android Open Source Project
+    Copyright (c) 2017 The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
         android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/>
 </vector>

res/drawable/ic_sim.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1 .9 2 2 2h12.01c1.1 0 1.99-.9
+1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4
+4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z" />
+</vector>

res/drawable/logo.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="320dp"
+    android:viewportWidth="512"
+    android:viewportHeight="320">
+
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M157.89,271.64a1.83,1.83,0,0,1-1.89-1.89V248.42h4.65v19.32H171v3.9Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M185,271.64V248.42h4.68v23.22Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M221.17,248.42h4.26v22a1.23,1.23,0,0,1-.67,1.09,3.17,3.17,0,0,1-1.67 .41
+,4,4,0,0,1-1.71-.29,3.11,3.11,0,0,1-1.12-1L210,256v15.61h-4.32v-21.5a1.56,1.56,0,0,1,.68-1.4,3.18,3.18,0,0,1,1.79-.46,3.59,3.59,0,0,1,1.9
+.39 ,5.91,5.91,0,0,1,1.41,1.56l9.72,13.59Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M256.9,252.36H246.2v5.5h9.63v3.93H246.2v5.89H256.6v4H241.51V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52h13.4Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M286.38,271.64l-2-5.76h-8.49l-2,5.76h-4.85l7.87-21.5q.68-1.85,3.15-1.85t3.19,1.89l7.87,21.46ZM277.27,262h5.82l-2.93-8.62Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M314.33,272a11,11,0,0,1-8.36-3.19,11.93,11.93,0,0,1-3.06-8.62,12.12,12.12,0,0,1,3.25-8.89,11.56,11.56,0,0,1,8.62-3.3,11.44,11.44,0,0,1,6,1.5,9,9,0,0,1,3.63,3.93l-3.74,2q-1.69-3.41-6-3.41a6.53,6.53,0,0,0-5.14,2.16,8.58,8.58,0,0,0-1.92,5.9,8.67,8.67,0,0,0,1.79,5.8,6.11,6.11,0,0,0,4.91,2.1,6.74,6.74,0,0,0,4.6-1.58,5.26,5.26,0,0,0,1.87-4h-5.89v-3.67h10.5v2.57a10.19,10.19,0,0,1-3.12,7.72A11.12,11.12,0,0,1,314.33,272Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M356,252.36H345.3v5.5h9.63v3.93H345.3v5.89h10.41v4H340.62V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52H356Z" />
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72
+.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6
+a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />
+</vector>

res/drawable/mod_ready.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="256dp"
-        android:height="114dp"
-        android:viewportWidth="256"
-        android:viewportHeight="114">
-
-    <path android:fillColor="@color/white"
-          android:pathData="M40,113.7V77.1h14.3c7.5,0,12.3,4,12.3,11.1c0,6.2-3,9.4-8.6,10.6l8,14.9h-5.8l-7.7-14.5h-7.4v14.5H40z
-            M45.2,94.6h8.7 c4.6,0,7.5-1.9,7.5-6.3c0-4.2-2.5-6.4-7.5-6.4h-8.6v12.7H45.2z
-            M78.7,113.7V77.1h22.4V82H84v10.6h15.7v4.7H84V109h17.2v4.8
-            L78.7,113.7L78.7,113.7z
-            M136.5,113.7L134,107h-15.7l-2.4,6.7h-5.4l13.2-36.6h5l13.2,36.6H136.5z
-            M126.1,84.7l-6.2,17.8h12.6 l-6.2-17.8H126.1z
-            M152.7,113.7V77.1h11.7c8.1,0,15.9,5.6,15.9,18.3c0,13.6-7.6,18.4-16.2,18.4L152.7,113.7L152.7,113.7z
-            M158,108.9 h5.9c6.9,0,10.8-3.8,10.8-13.6c0-8.8-4-13.4-10.5-13.4H158V108.9z
-            M198.8,113.7V98.3l-12-21.2h5.7l8.8,16.4h0.1l8.9-16.4h5.7
-            l-12,21.2v15.4C204,113.7,198.8,113.7,198.8,113.7z
-            M73.1,20.8c0-11.3-9.2-20.5-20.6-20.5H0.2v58.1h9.3V9.5H32v48.8h9.3V9.5h11.3
-            c6.2,0,11.3,5.1,11.3,11.3v37.5h9.3L73.1,20.8L73.1,20.8z
-            M164.5,26.6v-3.4v-2.4c0-11.3-9.2-20.5-20.6-20.5h-26.7
-            c-11.3,0-20.5,9.2-20.5,20.5v4.6v1.2V32v1.7v4.2c0,11.3,9.2,20.5,20.5,20.5h26.7c11.3,0,20.6-9.2,20.6-20.5v-2.3V32V26.6z
-            M155.2,37.8c0,6.2-5.1,11.3-11.3,11.3h-26.7c-6.2,0-11.3-5.1-11.3-11.3v-17c0-6.2,5.1-11.3,11.3-11.3h26.7
-            c6.2,0,11.3,5.1,11.3,11.3V37.8z
-            M235.2,0.3H188v58.1h47.2c11.3,0,20.6-9.2,20.6-20.5v-17C255.8,9.5,246.6,0.3,235.2,0.3z
-            M246.5,37.8c0,6.2-5.1,11.3-11.3,11.3h-38V9.5h38c6.2,0,11.3,5.1,11.3,11.3V37.8z" />
-</vector>

res/drawable/tick.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+</vector>

res/drawable/timelapse.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
+19 19 17.59 13.41 12z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/layout-land/logo_header.xml

@@ -1,50 +0,0 @@
-<?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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/header"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:paddingTop="@dimen/header_logo_margin_top"
-                android:background="@color/primary"
-                style="@style/Header">
-
-    <ImageView
-        android:id="@+id/brand_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/brand"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"
-        android:layout_alignParentTop="true"/>
-
-    <ImageView
-        android:id="@+id/powered_by_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/powered_by"
-        android:visibility="gone"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"
-        android:layout_below="@+id/brand_logo"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/page_title_height"
-        style="@style/PageTitle" />
-
-</RelativeLayout>

res/layout-land/setup_locale.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,16 +14,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/header"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
               android:layout_width="match_parent"
-                android:layout_height="@dimen/header_height"
-                android:background="@color/header_bg"
-                style="@style/Header">
+              android:layout_height="match_parent">
 
-    <TextView
+    <include layout="@layout/header_condensed" />
+
+    <com.cyanogenmod.setupwizard.ui.LocalePicker
+        android:id="@+id/locale_list"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/page_title_height"
-        style="@style/PageTitle" />
-
-</RelativeLayout>
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:layout_centerInParent="true"/>
+</LinearLayout>

res/layout-land/setup_welcome_page.xml

@@ -17,28 +17,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="horizontal"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <include layout="@layout/logo_header" />
-
-    <RelativeLayout android:id="@+id/page"
-                 android:layout_width="0px"
               android:layout_height="match_parent"
-                 android:layout_weight="1"
-                 android:gravity="center"
-                 android:paddingLeft="@dimen/content_margin_left"
-                 android:paddingRight="@dimen/content_margin_left"
-                 style="@style/PageContent">
+              android:layout_gravity="center">
 
-        <com.cyanogenmod.setupwizard.ui.LocalePicker
-            android:id="@+id/locale_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/min_locale_picker_height"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:layout_centerInParent="true"/>
-
-    </RelativeLayout>
+    <ImageView
+        android:id="@+id/brand_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@drawable/logo"
+        android:adjustViewBounds="true"
+        android:scaleType="fitCenter"
+        android:padding="@dimen/content_margin_left"/>
 
 </LinearLayout>

res/layout-land/sim_missing_page.xml

@@ -19,7 +19,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <FrameLayout android:id="@+id/page"
                  android:layout_width="match_parent"
@@ -55,7 +55,3 @@
         </LinearLayout>
     </FrameLayout>
 </LinearLayout>
-
-
-
-

res/layout/button_bar.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -24,13 +25,16 @@
     <Button
         style="@style/ButtonBar.Left"
         android:id="@+id/prev_button"
-        android:layout_width="wrap_content"
-        android:layout_weight="1"/>
+        android:layout_width="0dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_weight="3"/>
 
     <Button
         style="@style/ButtonBar.Right"
         android:id="@+id/next_button"
-        android:layout_width="wrap_content"
-        android:text="@string/next" />
+        android:layout_width="0dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/next"
+        android:layout_weight="2" />
 
 </LinearLayout>

res/layout/choose_data_sim_page.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <FrameLayout android:id="@+id/page"
                  android:layout_width="match_parent"
@@ -63,5 +64,3 @@
             android:visibility="gone"/>
     </FrameLayout>
 </LinearLayout>
-
-

res/layout/header_condensed.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,12 +19,29 @@
     android:id="@+id/header"
     android:layout_width="match_parent"
     android:layout_height="@dimen/header_condensed_height"
-                android:background="@color/header_condensed_bg"
-                style="@style/Header">
+    android:paddingTop="48dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/header_icon"
+        android:layout_width="64dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        android:contentDescription="@null" />
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="@dimen/page_title_height"
+        android:layout_height="64dp"
+        android:layout_toEndOf="@id/header_icon"
+        android:paddingEnd="8dp"
+        android:typeface="monospace"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:ellipsize="end"
         style="@style/PageTitle" />
 
 </RelativeLayout>

res/layout/logo_header.xml

@@ -1,48 +0,0 @@
-<?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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/header"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/logo_header_height"
-                android:background="@color/primary"
-                style="@style/Header">
-
-    <ImageView
-        android:id="@+id/brand_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/brand"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"
-        android:layout_above="@+id/powered_by_logo"/>
-
-    <ImageView
-        android:id="@+id/powered_by_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/powered_by"
-        android:visibility="gone"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"
-        android:layout_above="@android:id/title"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/page_title_height"
-        style="@style/PageTitle" />
-
-</RelativeLayout>

res/layout/mobile_data_settings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <ProgressBar
         android:id="@+id/progress"
@@ -102,4 +103,3 @@
         </ScrollView>
     </FrameLayout>
 </LinearLayout>
-

res/layout/setup_cyanogen_services.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -209,6 +210,41 @@
                         android:text="@string/services_os_nav_keys_label"/>
 
                 </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/privacy_guard"
+                    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"
+                    android:clickable="true">
+
+                    <CheckBox
+                        android:id="@+id/privacy_guard_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/privacy_guard_summary"
+                        android:layout_width="0px"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textSize="15sp"
+                        android:lineSpacingExtra="@dimen/setup_line_spacing"
+                        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_privacy_guard"/>
+
+                </LinearLayout>
+
             </LinearLayout>
         </ScrollView>
     </FrameLayout>

res/layout/setup_datetime_page.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <FrameLayout android:id="@+id/page"
                  android:layout_width="match_parent"

res/layout/setup_fingerprint.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <FrameLayout android:id="@+id/page"
         android:layout_width="match_parent"

res/layout/setup_finished_page.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,36 +29,11 @@
        android:id="@+id/brand_logo"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:src="@drawable/brand_finish"
-        android:scaleType="centerInside"
+       android:src="@drawable/logo"
+       android:adjustViewBounds="true"
+       android:scaleType="fitCenter"
        android:padding="@dimen/content_margin_left"/>
 
-
-
-    <TextView android:id="@+id/mod_welcome"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:textSize="20sp"
-              android:layout_marginTop="105dp"
-              android:paddingLeft="@dimen/content_margin_left"
-              android:paddingRight="@dimen/content_margin_right"
-              android:text="@string/mod_welcome"
-              android:fontFamily="sans-serif-medium"
-              android:textColor="@color/white"
-              android:visibility="gone"/>
-
-
-    <TextView android:id="@+id/mod_desc"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:textSize="16sp"
-              android:layout_marginTop="16dp"
-              android:paddingLeft="@dimen/content_margin_left"
-              android:paddingRight="@dimen/content_margin_right"
-              android:text="@string/mod_description"
-              android:textColor="@color/white"
-              android:visibility="gone"/>
-
     <Space android:layout_width="match_parent"
            android:layout_height="0px"
            android:layout_weight="1"/>

res/layout/setup_loading_page.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,14 +20,16 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <ProgressBar
         android:id="@+id/progressBar1"
         style="?android:attr/progressBarStyleHorizontal"
         android:indeterminateOnly="true"
         android:layout_width="match_parent"
-        android:layout_height="8dp" />
+        android:layout_height="8dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp" />
 
     <FrameLayout android:id="@+id/page"
                  android:layout_width="match_parent"
@@ -34,7 +37,3 @@
                  android:layout_weight="1"
                  style="@style/PageContent"/>
 </LinearLayout>
-
-
-
-

res/layout/setup_locale.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <include layout="@layout/header_condensed" />
+
+    <RelativeLayout android:id="@+id/page"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1"
+                 android:gravity="center"
+                 android:paddingLeft="@dimen/content_margin_left"
+                 android:paddingRight="@dimen/content_margin_left"
+                 style="@style/PageContent">
+
+        <com.cyanogenmod.setupwizard.ui.LocalePicker
+            android:id="@+id/locale_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"/>
+
+    </RelativeLayout>
+</LinearLayout>

res/layout/setup_lockscreen.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/header_condensed" />
+
+    <FrameLayout android:id="@+id/page"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <ScrollView 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="wrap_content"
+                android:paddingStart="@dimen/content_margin_left"
+                android:paddingEnd="@dimen/content_margin_left"
+                style="@style/PageContent">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/PageSummaryText"
+                    android:textSize="16sp"
+                    android:layout_marginBottom="@dimen/summary_margin_bottom"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:text="@string/lockscreen_setup_summary" />
+
+                <Button
+                    android:id="@+id/setup_lockscreen"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:gravity="center"
+                    android:textSize="16sp"
+                    android:textAllCaps="true"
+                    android:textColor="@color/white"
+                    android:background="@color/accent"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:text="@string/lockscreen_setup_screen_lock_setup"/>
+
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+</LinearLayout>

res/layout/setup_modguide_page.xml

@@ -1,102 +0,0 @@
-<?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.
--->
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/mod_yellow">
-
-    <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="296dp">
-        <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                android:src="@drawable/img_oobe_hero"
-                tools:ignore="ContentDescription"/>
-        <ImageView
-                android:layout_width="140dp"
-                android:layout_height="32dp"
-                android:src="@drawable/ic_logo_mod_title"
-                android:tint="@color/white"
-                android:layout_marginTop="72dp"
-                android:layout_marginStart="24dp"
-                tools:ignore="ContentDescription"/>
-    </FrameLayout>
-
-    <TextView android:id="@+id/mod_welcome"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:minHeight="20sp"
-              android:textSize="16sp"
-              android:fontFamily="sans-serif"
-              android:layout_marginTop="32dp"
-              android:paddingStart="24dp"
-              android:paddingEnd="24dp"
-              android:text="@string/mod_welcome"
-              android:textColor="@color/mod_title"/>
-
-    <TextView android:id="@+id/mod_desc"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:fontFamily="sans-serif"
-              android:textSize="14sp"
-              android:lineSpacingExtra="6sp"
-              android:layout_marginTop="3dp"
-              android:paddingStart="24dp"
-              android:paddingEnd="24dp"
-              android:text="@string/mod_description"
-              android:textColor="@color/mod_description"/>
-
-    <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="72dp"
-            android:minWidth="208dp"
-            android:layout_marginTop="25dp"
-            android:layout_marginStart="24dp"
-            android:background="@drawable/btn_mod_oobe">
-
-        <LinearLayout
-                android:id="@+id/explore_mod_guide"
-                android:layout_width="wrap_content"
-                android:layout_height="40dp"
-                android:minWidth="176dp"
-                android:orientation="horizontal">
-
-            <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@mipmap/ic_modguide"
-                    android:layout_margin="8dp"
-                    tools:ignore="ContentDescription"/>
-
-            <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:gravity="center_vertical"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/mod_explore"
-                    android:textAllCaps="false"
-                    android:textColor="@color/mod_title"/>
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>

res/layout/setup_welcome_page.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,27 +18,24 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
+              android:background="@color/primary">
 
-    <include layout="@layout/logo_header" />
+    <Space android:layout_width="match_parent"
+           android:layout_height="0px"
+           android:layout_weight="1"/>
 
-    <RelativeLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1"
-                 android:gravity="center"
-                 android:paddingLeft="@dimen/content_margin_left"
-                 android:paddingRight="@dimen/content_margin_left"
-                 style="@style/PageContent">
-
-        <com.cyanogenmod.setupwizard.ui.LocalePicker
-            android:id="@+id/locale_list"
+    <ImageView
+        android:id="@+id/brand_logo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:layout_centerInParent="true"/>
+        android:src="@drawable/logo"
+        android:adjustViewBounds="true"
+        android:scaleType="fitCenter"
+        android:padding="@dimen/content_margin_left"/>
 
-    </RelativeLayout>
+    <Space android:layout_width="match_parent"
+           android:layout_height="0px"
+           android:layout_weight="1"/>
 
 </LinearLayout>

res/layout/sim_missing_page.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
 
     <FrameLayout android:id="@+id/page"
                  android:layout_width="match_parent"
@@ -54,7 +55,3 @@
         </LinearLayout>
     </FrameLayout>
 </LinearLayout>
-
-
-
-

res/layout/terms_webview.xml

@@ -1,35 +0,0 @@
-<?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-af/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -20,10 +20,12 @@
     <string name="next">Volgende</string>
     <string name="skip">Slaan oor</string>
     <string name="start">Begin</string>
+    <string name="done">Gedoen</string>
     <string name="ok">OK</string>
     <string name="loading">Net \'n sekonde\u2026</string>
     <string name="setup_complete">Opstelling is voltooi</string>
     <string name="setup_welcome">Welkom</string>
+    <string name="setup_locale">Taal</string>
     <string name="setup_wifi">Kies Wi\u2011Fi</string>
     <string name="setup_sim_missing">SIM-kaart ontbreek</string>
     <string name="setup_choose_data_sim">Kies \'n SIM vir data</string>
@@ -53,23 +55,20 @@
     <string name="yes">Ja</string>
     <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">Noodoproep</string>
-  <string name="setup_services">Cyanogen funksies</string>
-  <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="setup_services">LineageOS kenmerke</string>
+    <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
+    <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
     <string name="services_privacy_policy">Privaatheid beleid</string>
     <string name="services_help_improve_cm">Help verbeter <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> deur outomaties diagnostiese en gebruikers data te stuur na Cyanogen. Hierdie inligting kan nie gebruik word om jou te identifiseer nie en help spanne werk op dinge soos battery lewe, program werkverrigting en nuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funksies.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> deur outomaties diagnostiese en gebruikersdata na LineageOS te stuur. Hierdie inligting kan nie gebruik word om jou te identifiseer nie en help spanne werk op dinge soos batterylewe, programwerkverrigting en nuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> kenmerke.</string>
     <string name="services_apply_theme">Pas <xliff:g id="name" example="Material">%s</xliff:g> tema toe</string>
     <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer \'n unieke visuele styl vir jou ikone, agtergrond en nog baie meer.</string>
     <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
-  <string name="services_use_secure_sms">Maak gebruik van veilige SMS</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> toestel.</string>
+    <string name="services_os_privacy_guard"><b>Aktiveer privatheidheidswag</b>om jou persoonlike data soos kontakte, boodskappe of oproepgeskiedenis nie beskikbaar vir nuut geïnstalleerde toepassings te maak nie</string>
     <string name="setup_unlock">Ontsluit</string>
     <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string>
-  <string name="setup_require_cyanogen_label"><b>Benodig  jou Cyanogen wagwoord</b> om jou toestel te gebruik, selfs nadat \'n fabriek herstel gedoen is.</string>
+    <string name="setup_require_cyanogen_label"><b>Jou rekening wagwoord sal vereis word</b> om jou toestel te gebruik, selfs na \'n fabriek herstel.</string>
     <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings &gt; Sekuriteit</i></string>
-  <string name="setup_warning_skip_anyway">Sonder \'n Cyanogen bedryfstelsel rekening, sal jy nie in staat wees om:\n\nOm jou toestel met nuwe ikone, agtergronde en meer in die Temas program te verpersoonlik nie\n\nJou toestel te vind of op te spoor indien dit verlore gaan nie</string>
-  <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Kies nog \'n skerm sluit tipe</string>
     <string name="settings_fingerprint_setup_details">Hoe wil jy jou skerm sluit?</string>
     <string name="fingerprint_setup_title">Vingerafdruk opstelling</string>
@@ -78,5 +77,9 @@
     <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
     <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
     <string name="sim_locale_changed">%1$s SIM opgespoor</string>
-  <!-- MOD stuff -->
+    <string name="settings_lockscreen_setup_title">Kies skerm sluit tipe</string>
+    <string name="settings_lockscreen_setup_details">Hoe wil jy jou skerm sluit?</string>
+    <string name="lockscreen_setup_title">Beskerm jou foon</string>
+    <string name="lockscreen_setup_summary"><b>Beskerm die toestel</b>\" en vereis \'n PIN, patroon of wagwoord om skerm te ontsluit\"</string>
+    <string name="lockscreen_setup_screen_lock_setup">Stel op</string>
 </resources>

res/values-ar/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -20,10 +20,12 @@
     <string name="next">التالي</string>
     <string name="skip">تخطي</string>
     <string name="start">البداية</string>
+    <string name="done">تم</string>
     <string name="ok">موافق</string>
     <string name="loading">ثانية واحدة</string>
     <string name="setup_complete">الإعداد تم</string>
     <string name="setup_welcome">مرحبا</string>
+    <string name="setup_locale">اللغة</string>
     <string name="setup_wifi">تحديد الواي فاي</string>
     <string name="setup_sim_missing">شريحة SIM مفقودة</string>
     <string name="setup_choose_data_sim">اختر شريحة SIM للبيانات</string>
@@ -53,23 +55,20 @@
     <string name="yes">نعم</string>
     <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">مكالمة طوارئ</string>
-  <string name="setup_services">ميزات Cyanogen</string>
-  <string name="services_explanation" product="tablet">تعمل هذه الخدمات  على توسيع نطاق إمكانيات الكمبيوتر اللوحي الخاص بك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_explanation" product="default">تعمل هذه الخدمات  على توسيع نطاق إمكانيات هاتفك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="setup_services">ميزات LineageOS</string>
+    <string name="services_explanation" product="tablet">تعمل هذه الخدمات على توسيع نطاق إمكانيات كمبيوترك اللوحي. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
+    <string name="services_explanation" product="default">تعمل هذه الخدمات على توسيع نطاق إمكانيات كمبيوترك اللوحي. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
     <string name="services_privacy_policy">سياسة الخصوصية</string>
     <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائياً إلى Cyanogen. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات  <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g> الجديدة.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائيًا إلى LineageOS. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g> الجديدة.</string>
     <string name="services_apply_theme">تطبيق السمة <xliff:g id="name" example="Material">%s </xliff:g></string>
     <string name="services_apply_theme_label">يعمل <xliff:g id="name" example="Apply the Material theme">%s</xliff:g> على تمكين نمط مرئي فريد للأيقونات الخاصة بك، الخلفية والمزيد.</string>
     <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
-  <string name="services_use_secure_sms">استخدام شريحة SIM آمنة</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g>.</string>
+    <string name="services_os_privacy_guard"><b>تمكين حماية الخصوصية</b> لجعل بياناتك الشخصية مثل الرسائل أو جهات الاتصال، وسجلات المكالمات غير متوفرة للتطبيقات المثبتة حديثًا</string>
     <string name="setup_unlock">فتح القفل</string>
     <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string>
-  <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حساب Cyanogen OS </b>كي تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>
+    <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حسابك</b> حتى تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>
     <string name="setup_device_locked_instructions"><i>من أجل تشغيل/تعطيل هذه الميزة، الرجاء إذهب إلى إعدادات &gt; الأمان</i></string>
-  <string name="setup_warning_skip_anyway">بدون حساب Cyanogen OS لن تستطيع أن:\n\nتخصص هاتفك بأيقونات وخلفيات جديدة والمزيد في تطبيق السمات\n\nأو تحديد مكان هاتفك أو مسح ذاكرته عن بعد إذا فُقد</string>
-  <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">حدد نوعاً احتياطياً لشاشة القفل</string>
     <string name="settings_fingerprint_setup_details">كيف تريد إقفال الشاشة؟</string>
     <string name="fingerprint_setup_title">إنشاء بصمة الإصبع</string>
@@ -78,5 +77,9 @@
     <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
     <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
     <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
-  <!-- MOD stuff -->
+    <string name="settings_lockscreen_setup_title">حدد نوع شاشة القفل</string>
+    <string name="settings_lockscreen_setup_details">كيف تريد إقفال الشاشة؟</string>
+    <string name="lockscreen_setup_title">حماية هاتفك</string>
+    <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
+    <string name="lockscreen_setup_screen_lock_setup">إعداد</string>
 </resources>

res/values-as-rIN/strings.xml

@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -53,22 +54,13 @@
     <string name="yes">হয়</string>
     <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">জৰুৰীকালীন কল</string>
-  <string name="setup_services">Cyanogen বৈশিষ্ট্যবোৰ</string>
-  <string name="services_explanation" product="tablet">এই সেৱাবোৰে আপোনাৰ টেবলেট কম্পিউটাৰৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা Cyanogen ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string>
-  <string name="services_explanation" product="default">এই সেৱাবোৰে আপোনাৰ ফোনৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা Cyanogen ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string>
     <string name="services_privacy_policy">গোপনীয়তা নীতি</string>
     <string name="services_help_improve_cm">স্বয়ংক্ৰিয়ভাবে ডায়গনষ্টিক আৰু ব্যৱহাৰ ডাটা Cyanogen লৈ প্ৰেৰণ কৰি <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> উন্নত কৰাত সহায় কৰক এই তথ্য আপোনাক চিনাক্ত কৰিবলৈ ব্যৱহাৰ কৰিব পৰা নাযায় আৰু বেটাৰীৰ আয়ুস, এপ্প্‌ৰ কাৰ্যকাৰীতা আৰু নতুন <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> বৈশিষ্ট্যবোৰৰ ওপৰত কাম কৰি থকা দলবোৰক সহায় কৰে।</string>
     <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> বিষয়বস্তুটো প্ৰয়োগ কৰক</string>
     <string name="services_os_nav_keys_label">হাৰ্ডৱেৰ কীবোৰৰ পৰিৱৰ্তে স্ক্ৰীণ <b>নেভিগেচন কীবোৰ ব্যৱহাৰ কৰক</b>।</string>
-  <string name="services_use_secure_sms">এটা</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ডিভাইচত সুৰক্ষিত SMS ব্যৱহাৰ কৰি থকা আন ব্যৱহাৰকৰ্তাৰ সৈতে SMS কথোপকথন এনক্ৰিপ্ট কৰিবলৈ সুৰক্ষিত SMS <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> ব্যৱহাৰ কৰক।</string>
     <string name="setup_unlock">আনলক</string>
     <string name="setup_device_locked">ডিভাইচটো ব্যৱহাৰকৰ্তাৰ দ্বাৰা লক কৰা হৈছে।</string>
-  <string name="setup_require_cyanogen_label">আনকি ফেক্টৰী ৰিছেটৰ পাছতো আপোনাৰ ডিভাইচটো ব্যৱহাৰ কৰিবলৈ <b>আপোনাৰ Cyanogen OS একাউণ্টৰ পাছৱৰ্ড প্ৰয়োজন</b>।</string>
     <string name="setup_device_locked_instructions"><i>এই বৈশিষ্ট্যটো অন/অফ কৰিবলৈ অনুগ্ৰহ কৰি ছেটিংচ &gt; নিৰাপত্তা লৈ যাওক</i></string>
-  <string name="setup_warning_skip_anyway">Cyanogen OS একাউণ্ট অবিহনে, আপুনি এইবোৰ কৰিবলৈ সক্ষম নহ\'ব:\n\nআপোনাৰ ফোনটো নতুন আইকন, ৱালপেপাৰ আৰু বিষয়বস্তুচ্‌ এপ্পৰ বহুতৰ সৈতে অনুকূলিত কৰিবলৈ\n\n আপোনাৰ ফোন হেৰালে অৱস্থান নিৰূপণ কৰিব বা দূৰৰ পৰাই আপোনাৰ ফোনটো মচি পেলাব</string>
-  <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">স্ক্ৰীণৰ বেকআপ লকৰ প্ৰকাৰ চয়ন কৰক</string>
     <string name="settings_fingerprint_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
     <string name="fingerprint_setup_title">আঙুলিৰছাপ ছেটআপ</string>
@@ -77,5 +69,5 @@
     <string name="fingerprint_setup_add_fingerprint">আপোনাৰ আঙুলিৰছাপ যোগ কৰক</string>
     <string name="fingerprint_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
     <string name="sim_locale_changed">%1$s SIM চিনাক্ত কৰা হৈছে</string>
-  <!-- MOD stuff -->
+    <string name="settings_lockscreen_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
 </resources>