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

Commit 511107c0 authored by Udam Saini's avatar Udam Saini Committed by Android (Google) Code Review
Browse files

Merge "Moves the encryption interstitial to use the list layout" into nyc-dev

parents f4ace6fe d553abcb

res/layout/encryption_interstitial.xml

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



<!--

  ~ Copyright (C) 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:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="?attr/side_margin"

        android:paddingEnd="?attr/side_margin">



    <TextView

            android:id="@+id/encryption_message"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

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

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

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



    <RadioGroup

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

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

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

            android:checkedButton="@+id/encrypt_require_password">



        <RadioButton

                android:id="@+id/encrypt_require_password"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp" />



        <RadioButton

                android:id="@+id/encrypt_dont_require_password"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp" />



    </RadioGroup>



</LinearLayout>

res/layout/encryption_interstitial_header.xml

0 → 100644
+27 −0
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:paddingTop="16dp"

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

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

    android:paddingBottom="16dp"

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

res/layout/setup_encryption_interstitial.xml

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

<!--

    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

-->



<com.android.setupwizardlib.SetupWizardLayout

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

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    settings:suwBackgroundTile="@drawable/setup_illustration_tile"

    settings:suwHeaderText="@string/encryption_interstitial_header"

    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"

    settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">



    <LinearLayout

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <TextView

            android:id="@+id/encryption_message"

            style="@style/SuwDescription"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <RadioGroup

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:checkedButton="@+id/encrypt_require_password">



            <RadioButton

                android:id="@+id/encrypt_require_password"

                style="@style/SuwRadioButton"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



            <RadioButton

                android:id="@+id/encrypt_dont_require_password"

                style="@style/SuwRadioButton"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



        </RadioGroup>



    </LinearLayout>



</com.android.setupwizardlib.SetupWizardLayout>

res/layout/setup_encryption_interstitial_header.xml

0 → 100644
+28 −0
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_margin_bottom"

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

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

    android:paddingTop="@dimen/suw_description_margin_top"

    android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"

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

res/xml/security_settings_encryption_interstitial.xml

0 → 100644
+30 −0
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">



    <Preference

        android:key="encrypt_require_password"

        android:persistent="false"/>



    <Preference

        android:key="encrypt_dont_require_password"

        android:persistent="false"/>



</PreferenceScreen>