am 08ac9bc6: am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev

* commit '08ac9bc6063af2e265964e1c8d650da536af10b7':
  Add Screen pinning back to settings

res/layout/screen_pinning_instructions.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, 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.
+*/
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/instructions_area"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides">
+
+    <TextView
+        android:id="@+id/screen_pinning_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:paddingTop="@dimen/screen_pinning_textview_padding"
+        android:text="@string/screen_pinning_description"
+        android:textAppearance="@style/TextAppearance.Medium"
+        />
+
+</LinearLayout>

res/values/dimens.xml

@@ -183,4 +183,7 @@
     <!-- CryptKeeper pattern size for tablet -->
     <dimen name="crypt_keeper_pattern_size">354dip</dimen>
 
+    <!-- Screen pinning textview paddings -->
+    <dimen name="screen_pinning_textview_padding">40dp</dimen>
+
 </resources>

res/values/strings.xml

@@ -5768,4 +5768,10 @@
     <!-- Switch On/Off  -->
     <string name="switch_on_text">On</string>
     <string name="switch_off_text">Off</string>
+
+    <!-- [CHAR LIMIT=28] Screen pinning title -->
+    <string name="screen_pinning_title">Screen pinning</string>
+    <!-- [CHAR LIMIT=300] Screen pinning description -->
+    <string name="screen_pinning_description">When this setting is turned on, you can put the device in a state that keeps the current screen in view.\n\nTo pin a screen:\n\n1. Turn this setting on.\n\n2. Open an app.\n\n3. Touch the Recents button.\n\n4. Touch the pin icon.</string>
+
 </resources>

res/xml/security_settings_misc.xml

@@ -23,10 +23,13 @@
         <Preference android:key="sim_lock_settings"
                 android:title="@string/sim_lock_settings_category"
                 android:persistent="false">
+
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
                     android:targetClass="com.android.settings.IccLockSettings"/>
+
         </Preference>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/security_passwords_title"
@@ -35,6 +38,7 @@
         <CheckBoxPreference android:key="show_password"
                 android:title="@string/show_password"
                 android:persistent="false"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="device_admin_category"
@@ -58,11 +62,13 @@
                 android:summaryOff="@string/verify_applications_summary"
                 android:summaryOn="@string/verify_applications_summary"
                 android:persistent="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="credentials_management"
             android:title="@string/credentials_title"
             android:persistent="false">
+
         <Preference android:key="credential_storage_type"
                 android:title="@string/credential_storage_type"
                 style="?android:attr/preferenceInformationStyle"
@@ -78,28 +84,42 @@
                 android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"
                 android:persistent="false">
+
             <intent android:action="android.credentials.INSTALL"
                     android:targetPackage="com.android.certinstaller"
                     android:targetClass="com.android.certinstaller.CertInstallerMain"/>
+
         </Preference>
 
         <Preference android:key="credentials_reset"
                 android:title="@string/credentials_reset"
                 android:summary="@string/credentials_reset_summary"
                 android:persistent="false">
+
             <intent android:action="com.android.credentials.RESET"
                     android:targetPackage="com.android.settings"
                     android:targetClass="com.android.settings.CredentialStorage"/>
+
         </Preference>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="advanced_security"
             android:title="@string/advanced_security_title"
             android:persistent="false">
+
         <Preference android:key="manage_trust_agents"
                 android:title="@string/manage_trust_agents"
                 android:summary="@string/manage_trust_agents_summary"
                 android:persistent="false"
                 android:fragment="com.android.settings.AdvancedSecuritySettings"/>
+
+        <PreferenceScreen
+                android:key="screen_pinning_settings"
+                android:title="@string/screen_pinning_title"
+                android:summary="@string/switch_off_text"
+                android:fragment="com.android.settings.ScreenPinningSettings"/>
+
     </PreferenceCategory>
+
 </PreferenceScreen>