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

Commit ab104b2c authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Make backup/restore confirmation UI landscape-friendly"

parents cffb287b 31deacf6

packages/BackupRestoreConfirmation/res/layout/confirm_backup.xml

+27 −6
Original line number Diff line number Diff line
@@ -18,11 +18,21 @@ 
 */

-->



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

                android:layout_width="fill_parent" 

                android:layout_height="wrap_content"

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

              android:layout_width="match_parent" 

              android:layout_height="match_parent"

              android:orientation="vertical"

              android:padding="16dp" >



    <ScrollView 

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_width="match_parent">

        <LinearLayout

                android:orientation="vertical"

                android:layout_height="wrap_content"

                android:layout_width="match_parent">



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

              android:layout_width="match_parent" 

              android:layout_height="wrap_content"
@@ -63,13 +73,21 @@ 
              android:layout_marginLeft="30dp"

              android:layout_below="@id/enc_password"

              android:layout_marginBottom="30dp" />

        </LinearLayout>

    </ScrollView>



    <LinearLayout android:orientation="horizontal"

                  android:layout_height="wrap_content"

                  android:layout_width="match_parent"

                  android:layout_gravity="bottom">



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

            android:filterTouchesWhenObscured="true"

            android:text="@string/allow_backup_button_label"

            android:layout_below="@id/package_name"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content" />

            android:layout_width="0dp"

            android:layout_weight="1" />



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

            android:text="@string/deny_backup_button_label"
@@ -77,6 +95,9 @@ 
            android:layout_toRightOf="@id/button_allow"

            android:layout_alignTop="@id/button_allow"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content" />

            android:layout_width="0dp"

            android:layout_weight="1" />



    </LinearLayout>



</RelativeLayout>
 
</LinearLayout>

packages/BackupRestoreConfirmation/res/layout/confirm_restore.xml

+73 −52
Original line number Diff line number Diff line
@@ -18,11 +18,21 @@ 
 */

-->



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

                android:layout_width="fill_parent" 

                android:layout_height="wrap_content"

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

              android:layout_width="match_parent" 

              android:layout_height="match_parent"

              android:orientation="vertical"

              android:padding="16dp" >



    <ScrollView 

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_width="match_parent">

        <LinearLayout

                android:orientation="vertical"

                android:layout_height="wrap_content"

                android:layout_width="match_parent">



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

                  android:layout_width="match_parent" 

                  android:layout_height="wrap_content"
@@ -62,14 +72,22 @@ 
                  android:layout_height="20dp"

                  android:layout_marginLeft="30dp"

                  android:layout_below="@id/enc_password"

              android:layout_marginBottom="30dp" />

                  android:layout_marginBottom="10dp" />

        </LinearLayout>

    </ScrollView>



    <LinearLayout android:orientation="horizontal"

                  android:layout_height="wrap_content"

                  android:layout_width="match_parent"

                  android:layout_gravity="bottom">



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

                android:filterTouchesWhenObscured="true"

                android:text="@string/allow_restore_button_label"

                android:layout_below="@id/package_name"

                android:layout_height="wrap_content"

            android:layout_width="wrap_content" />

                android:layout_width="0dp"

                android:layout_weight="1" />



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

                android:text="@string/deny_restore_button_label"
@@ -77,6 +95,9 @@ 
                android:layout_toRightOf="@id/button_allow"

                android:layout_alignTop="@id/button_allow"

                android:layout_height="wrap_content"

            android:layout_width="wrap_content" />

                android:layout_width="0dp"

                android:layout_weight="1" />



    </LinearLayout>



</RelativeLayout>
 
</LinearLayout>