Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9be96e06 authored by Maurice Lam's avatar Maurice Lam
Browse files

Use buttons for EncryptionInterstitial 

Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
parent 304d7f44

res/layout/encryption_interstitial.xml

0 → 100644
+69 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2017 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.

-->



<com.android.setupwizardlib.GlifLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_lock">



    <LinearLayout

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">



        <TextView

            android:id="@+id/encryption_message"

            style="@style/SuwDescription.Glif"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:baselineAligned="false"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:orientation="horizontal">



            <Button

                android:id="@+id/encrypt_dont_require_password"

                style="@style/SetupWizardButton.Negative"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/encryption_interstitial_no" />



            <Space

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1" />



            <Button

                android:id="@+id/encrypt_require_password"

                style="@style/SetupWizardButton.Positive"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/encryption_interstitial_yes" />



        </LinearLayout>



    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>

res/layout/encryption_interstitial_header.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2016 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.

-->



<TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/encryption_interstitial_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:minHeight="56dp"

    android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="@dimen/suw_description_glif_margin_top"

    android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"

    android:textAppearance="?android:attr/textAppearanceListItem" />

res/layout/setup_encryption_interstitial_header.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2016 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.

-->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:minHeight="56dp"

    android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="@dimen/suw_description_glif_margin_top"

    android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"

    android:textAppearance="?android:attr/textAppearanceListItem" />

res/values/strings.xml

+11 −20
Original line number Diff line number Diff line
@@ -6830,39 +6830,30 @@ 
    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->

    <string name="encryption_interstitial_message_pin">

   You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.

   \n\nThis helps protect data on lost or stolen devices.

   \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?

   </string>

    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->

    <string name="encryption_interstitial_message_pattern">

   You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.

   \n\nThis helps protect data on lost or stolen devices.

   \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?

   </string>

    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->

    <string name="encryption_interstitial_message_password">

   You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.

   \n\nThis helps protect data on lost or stolen devices.

   \n\nThis helps protect data on lost or stolen devices. Require password to start your device?

   </string>















    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->













    <string name="encryption_interstitial_message_pin_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices.</string>













    <string name="encryption_interstitial_message_pin_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?</string>















    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->













    <string name="encryption_interstitial_message_pattern_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices.</string>













    <string name="encryption_interstitial_message_pattern_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?</string>















    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->













    <string name="encryption_interstitial_message_password_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices.</string>

























    <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->













    <string name="encrypt_require_pin">Require PIN to start device</string>













    <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->













    <string name="encrypt_require_pattern">Require pattern to start device</string>













    <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->













    <string name="encrypt_require_password">Require password to start device</string>

























    <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->













    <string name="encrypt_dont_require_pin">No thanks</string>













    <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->













    <string name="encrypt_dont_require_pattern">No thanks</string>













    <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->













    <string name="encrypt_dont_require_password">No thanks</string>













    <string name="encryption_interstitial_message_password_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device></string>

























    <!-- Button label to say yes to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->













    <string name="encryption_interstitial_yes">Yes</string>













    <!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->













    <string name="encryption_interstitial_no">No</string>





























   <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->















   <string name="encrypt_talkback_dialog_require_pin">Require PIN?</string>

























res/xml/security_settings_encryption_interstitial.xml
deleted100644 → 0



+0
−32




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













    Copyright (C) 2016 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.













-->



























<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"













    android:title="@string/lock_settings_picker_title"













    android:key="lock_settings_picker">



























    <com.android.settings.MultiLinePreference













        android:icon="@drawable/ic_lock_list_icon"













        android:key="encrypt_require_password"













        android:persistent="false"/>



























    <Preference













        android:icon="@drawable/ic_skip"













        android:key="encrypt_dont_require_password"













        android:persistent="false"/>



























</PreferenceScreen>