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

Commit a5c42108 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Layout change in support card and support dialog"

parents 84ec452c a709e754

res/layout/support_disclaimer_content.xml

+18 −15
Original line number Diff line number Diff line
@@ -13,8 +13,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

<ScrollView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"
@@ -32,5 +35,5 @@ 
            android:layout_height="wrap_content"

            android:text="@string/support_disclaimer_do_not_show"

            android:textColor="?android:attr/textColorSecondary"/>



    </LinearLayout>

</ScrollView>

res/layout/support_escalation_options.xml

+4 −2
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ 
        android:gravity="center_horizontal"

        android:orientation="horizontal">

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="8dp"
@@ -63,7 +64,8 @@ 
                android:textColor="?android:attr/textColorSecondary"/>

        </LinearLayout>

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="8dp"

res/values-sw400dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,4 +25,7 @@ 


    <dimen name="setup_fingerprint_ring_radius">92dp</dimen>

    <dimen name="setup_fingerprint_progress_bar_size">192dp</dimen>



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

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

</resources>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -315,4 +315,8 @@ 
    <!-- Visible vertical space we want to show below password edittext field when ime is shown.

         The unit is sp as it is related to the text size of password requirement item. -->

    <dimen name="visible_vertical_space_below_password">20sp</dimen>



    <!-- Padding for the escalation card in normal dimens -->

    <dimen name="support_escalation_card_padding_start">40dp</dimen>

    <dimen name="support_escalation_card_padding_end">40dp</dimen>

</resources>

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ 
        <item name="android:background">@color/card_background_grey</item>

        <item name="android:gravity">center</item>

        <item name="android:minHeight">368dp</item>

        <item name="android:paddingStart">56dp</item>

        <item name="android:paddingEnd">56dp</item>

        <item name="android:paddingStart">@dimen/support_escalation_card_padding_start</item>

        <item name="android:paddingEnd">@dimen/support_escalation_card_padding_end</item>

    </style>



    <style name="FingerprintHeaderStyle" parent="android:style/TextAppearance.Material.Subhead">