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

Commit a857c8da authored by Maurice Lam's avatar Maurice Lam
Browse files

Sticky footer for GLIF theme 

For settings screens using GLIF theme, update to sticky footers.

Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
parent 2b37b438

res/layout/choose_lock_password.xml

+1 −27
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_lock"

    settings:suwFooter="@layout/choose_lock_password_footer"

    settings:suwHeaderText="@string/lockpassword_choose_your_password_header">



    <LinearLayout
@@ -65,33 +66,6 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"/>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:clipChildren="false"

                android:clipToPadding="false"

                android:gravity="end"

                android:orientation="horizontal">



                <!-- left : cancel -->

                <Button android:id="@+id/cancel_button"

                    style="@style/SetupWizardButton.Negative"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



                <Space

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <!-- right : continue -->

                <Button android:id="@+id/next_button"

                    style="@style/SetupWizardButton.Positive"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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

            </LinearLayout>

        </LinearLayout>

    </LinearLayout>

res/layout/choose_lock_password_footer.xml

0 → 100644
+43 −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.

-->



<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->

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

    style="@style/SuwGlifButtonBar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <!-- left : cancel -->

    <Button android:id="@+id/cancel_button"

        style="@style/SuwGlifButton.Secondary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <!-- right : continue -->

    <Button android:id="@+id/next_button"

        style="@style/SuwGlifButton.Primary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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



</LinearLayout>

res/layout/choose_lock_pattern_common.xml

+1 −29
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_lock"

    settings:suwFooter="@layout/choose_lock_pattern_common_footer"

    settings:suwHeaderText="@string/lockpassword_choose_your_pattern_header">



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
@@ -56,35 +57,6 @@ 
                android:layout_height="0dip"

                android:layout_weight="4" />



            <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:clipChildren="false"

                android:clipToPadding="false"

                android:orientation="horizontal">



                <!-- left : cancel, or re-try -->

                <Button android:id="@+id/footerLeftButton"

                    style="@style/SetupWizardButton.Negative"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



                <Space

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <!-- right : confirm or ok -->

                <Button android:id="@+id/footerRightButton"

                    style="@style/SetupWizardButton.Positive"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



            </LinearLayout>



        </LinearLayout>



        <TextView android:id="@+id/footerText"

res/layout/choose_lock_pattern_common_footer.xml

0 → 100644
+44 −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.

-->



<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->

<LinearLayout

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

    style="@style/SuwGlifButtonBar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <!-- left : cancel, or re-try -->

    <Button android:id="@+id/footerLeftButton"

        style="@style/SuwGlifButton.Secondary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <!-- right : confirm or ok -->

    <Button android:id="@+id/footerRightButton"

        style="@style/SuwGlifButton.Primary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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



</LinearLayout>

res/layout/confirm_lock_password_internal.xml

+7 −7
Original line number Diff line number Diff line
@@ -48,13 +48,6 @@ 
            android:layout_marginStart="?attr/suwMarginSides"

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



        <Button

            style="@style/SetupWizardButton.Negative"

            android:id="@+id/cancelButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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



        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"
@@ -94,5 +87,12 @@ 
            android:contentDescription="@string/confirm_fingerprint_icon_content_description"

            android:visibility="gone"/>



        <Button

            style="@style/SetupWizardButton.Negative"

            android:id="@+id/cancelButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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



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

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