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

Commit 6d550713 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev

parents 4a67b1c0 148eb471

res/layout-land/confirm_lock_password.xml

deleted100644 → 0
+0 −86
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.google.android.setupdesign.GlifLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_enterprise">



    <!--common_typos_disable-->

    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1">



        <TextView

            android:id="@+id/sud_layout_description"

            style="@style/SudDescription.Glif"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd" />



        <Button

            android:id="@+id/forgotButton"

            style="@style/SudGlifButton.Secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd"

            android:layout_gravity="center"

            android:visibility="gone" />



        <com.android.settings.widget.ScrollToParentEditText

            android:id="@+id/password_entry"

            android:layout_width="208dp"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:inputType="textPassword"

            android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

            android:gravity="center"

            style="@style/TextAppearance.PasswordEntry"/>



        <TextView

            style="@style/TextAppearance.ErrorText"

            android:accessibilityLiveRegion="polite"

            android:id="@+id/errorText"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"/>



        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />



        <Button

            android:id="@+id/cancelButton"

            style="@style/SudGlifButton.Secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd"

            android:layout_marginBottom="80dp"

            android:layout_gravity="center_horizontal"

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



    <!--common_typos_disable-->

    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

</com.google.android.setupdesign.GlifLayout>
 
 No newline at end of file

res/layout-land/confirm_lock_pattern.xml

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

<!-- Copyright (C) 2008 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.google.android.setupdesign.GlifLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_enterprise"

    android:layout="@layout/sud_glif_blank_template">



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <ScrollView

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:fillViewport="true">



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:paddingBottom="24dp">



                <ImageView

                    android:id="@+id/sud_layout_icon"

                    style="@style/SudGlifIcon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="?attr/sudGlifHeaderGravity"

                    android:src="@drawable/ic_enterprise" />



                <TextView

                    android:id="@+id/suc_layout_title"

                    style="@style/SudGlifHeaderTitle"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content" />



                <TextView

                    android:id="@+id/sud_layout_subtitle"

                    style="@style/SudDescription.Glif"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd" />



                <Button

                    android:id="@+id/cancelButton"

                    style="@style/SetupWizardButton.Negative"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

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



                <Button

                    android:id="@+id/forgotButton"

                    style="@style/SudGlifButton.Secondary"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

                    android:layout_gravity="center"

                    android:visibility="gone" />



                <Space

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <TextView

                    style="@style/TextAppearance.ErrorText"

                    android:accessibilityLiveRegion="polite"

                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

                    android:layout_marginBottom="24dp"

                    android:gravity="center_vertical"/>



            </LinearLayout>



        </ScrollView>



        <com.google.android.setupdesign.view.FillContentLayout

            style="@style/LockPatternContainerStyle"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingStart="0dp">



            <com.android.internal.widget.LockPatternView

                android:id="@+id/lockPattern"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center" />



        </com.google.android.setupdesign.view.FillContentLayout>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

</com.google.android.setupdesign.GlifLayout>

res/layout-land/confirm_lock_pattern_normal.xml

deleted100644 → 0
+0 −108
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.google.android.setupdesign.GlifLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_lock"

    android:layout="@layout/sud_glif_blank_template">



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">



        <ScrollView

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:fillViewport="true">



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:paddingBottom="24dp">



                <ImageView

                    android:id="@+id/sud_layout_icon"

                    style="@style/SudGlifIcon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="?attr/sudGlifHeaderGravity"

                    android:src="@drawable/ic_lock" />



                <TextView

                    android:id="@+id/suc_layout_title"

                    style="@style/SudGlifHeaderTitle"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content" />



                <TextView

                    style="@style/SudDescription.Glif"

                    android:id="@+id/sud_layout_subtitle"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd" />



                <Button

                    android:id="@+id/cancelButton"

                    style="@style/SetupWizardButton.Negative"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

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



                <Space

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <TextView

                    style="@style/TextAppearance.ErrorText"

                    android:accessibilityLiveRegion="polite"

                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

                    android:layout_marginBottom="24dp"

                    android:gravity="center_vertical"/>

            </LinearLayout>



        </ScrollView>



        <com.google.android.setupdesign.view.FillContentLayout

            style="@style/LockPatternContainerStyle"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingStart="0dp">



            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:background="@color/lock_pattern_background" />



        </com.google.android.setupdesign.view.FillContentLayout>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

</com.google.android.setupdesign.GlifLayout>

res/layout/confirm_lock_password_base.xml

+2 −25
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_enterprise"

    android:layout="@layout/sud_glif_blank_template">

    android:icon="@drawable/ic_enterprise">



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"
@@ -32,28 +31,6 @@ 
            android:layout_height="wrap_content"

            android:orientation="vertical">



            <ImageView

                android:id="@+id/sud_layout_icon"

                style="@style/SudGlifIcon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="?attr/sudGlifHeaderGravity"

                android:src="@drawable/ic_enterprise" />



            <TextView

                android:id="@+id/headerText"

                style="@style/SudGlifHeaderTitle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



            <TextView

                android:id="@+id/sud_layout_description"

                style="@style/SudDescription.Glif"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginStart="?attr/sudMarginStart"

                android:layout_marginEnd="?attr/sudMarginEnd" />



            <Button

                android:id="@+id/forgotButton"

                style="@style/SudGlifButton.Secondary"
@@ -82,7 +59,7 @@ 
                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:inputType="textPassword"

                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

                android:imeOptions="actionNext|flagForceAscii"

                android:gravity="center"

                style="@style/TextAppearance.PasswordEntry"/>

res/layout/confirm_lock_password_normal.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:inputType="textPassword"

                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

                android:imeOptions="actionNext|flagForceAscii"

                android:gravity="center"

                style="@style/TextAppearance.PasswordEntry"/>