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

Commit 015e9a3b authored by Charles Wang's avatar Charles Wang Committed by Android (Google) Code Review
Browse files

Merge "Save dialog changes so that buttons are shown in landscape -... 

Merge "Save dialog changes so that buttons are shown in landscape - screenshots at http://shortn/_n52tNerWx6 Test: locally tested on pixel/foldable/tablet Bug: b/290785192" into udc-qpr-dev
parents f0d77596 0fe6689f

core/res/res/layout/autofill_fill_dialog.xml

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

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

        android:layout_marginTop="@dimen/autofill_save_outer_margin"

        android:layout_marginBottom="24dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

core/res/res/layout/autofill_save.xml

+45 −39
Original line number Diff line number Diff line
@@ -22,22 +22,27 @@ 
    android:background="@drawable/autofill_bottomsheet_background"

    android:orientation="vertical">



    <LinearLayout

    <com.android.server.autofill.ui.BottomSheetLayout

        android:id="@+id/autofill_save"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:layout_marginTop="@dimen/autofill_save_outer_margin"

        android:background="?android:attr/colorSurface"

        android:gravity="center_horizontal"

        android:orientation="vertical">



        <ScrollView

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:fillViewport="true"

            android:layout_weight="1"

            android:layout_marginBottom="8dp">

            <LinearLayout

                android:layout_marginStart="@dimen/autofill_save_outer_margin"

                android:layout_marginEnd="@dimen/autofill_save_outer_margin"

                android:layout_width="fill_parent"

                android:orientation="vertical"

                android:layout_height="wrap_content"

            android:orientation="vertical">



                >

                <ImageView

                    android:id="@+id/autofill_save_icon"

                    android:scaleType="fitCenter"
@@ -55,26 +60,28 @@ 
                    android:gravity="center"

                    android:textAppearance="@style/AutofillSaveUiTitle">

                </TextView>



            <com.android.server.autofill.ui.CustomScrollView

                <LinearLayout

                    android:id="@+id/autofill_save_custom_subtitle"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:visibility="gone"/>



            </LinearLayout>

        </ScrollView>



        <com.android.internal.widget.ButtonBarLayout

            android:layout_width="match_parent"

            android:layout_height="48dp"

            android:layout_gravity="end"

            android:clipToPadding="false"

            android:layout_marginTop="32dp"

            android:layout_marginBottom="18dp"

            android:layout_marginTop="16dp"

            android:layout_marginBottom="8dp"

            android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"

            android:orientation="horizontal"

            android:gravity="center_vertical">



            android:gravity="center_vertical"

            android:layout_marginStart="@dimen/autofill_save_outer_margin"

            android:layout_marginEnd="@dimen/autofill_save_outer_margin"

            >

            <Button

                android:id="@+id/autofill_save_no"

                android:layout_width="wrap_content"
@@ -106,6 +113,5 @@ 


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



    </LinearLayout>



    </com.android.server.autofill.ui.BottomSheetLayout>

</LinearLayout>
 
 No newline at end of file

core/res/res/values-sw640dp/dimens.xml

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

<!--

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

  -->

<resources>

    <!-- Top and side margins for autofill dialog on tablets -->

    <dimen name="autofill_save_outer_margin">32dp</dimen>

</resources>
 
 No newline at end of file

core/res/res/values-w640dp/bools.xml

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

<!--

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

  -->



<resources>

    <!-- Whether or not to include horizontal space around the dialog -->

    <bool name="autofill_dialog_horizontal_space_included">true</bool>

</resources>
 
 No newline at end of file

core/res/res/values-w640dp/dimens.xml

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

<!--

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

  -->

<resources>

    <!-- How much extra space should be left around the autofill dialog -->

    <dimen name="autofill_dialog_offset">56dp</dimen>

</resources>
 
 No newline at end of file