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

Commit 375b9812 authored by Udam Saini's avatar Udam Saini Committed by Android (Google) Code Review
Browse files

Merge "Updates spacing on redaction interstitial" into nyc-dev

parents befc5c59 ec0baa97

res/layout/redaction_interstitial.xml

+42 −42
Original line number Diff line number Diff line
@@ -46,21 +46,21 @@ 
            android:id="@+id/show_all"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

            style="@style/RedactionItemAndLabel"

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



        <com.android.settings.RestrictedRadioButton

            android:id="@+id/redact_sensitive"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

            style="@style/RedactionItemAndLabel"

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



        <RadioButton

            android:id="@+id/hide_all"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

            style="@style/RedactionItemAndLabel"

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



    </RadioGroup>
@@ -69,7 +69,7 @@ 
        android:id="@+id/lockscreen_remote_input"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/redaction_vertical_margins"

        style="@style/RedactionItemAndLabel"

        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"

        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"

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

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -295,4 +295,7 @@ 
    <!-- Display Size and Font Size preview screen -->

    <dimen name="preview_pager_padding">8dp</dimen>



    <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->

    <dimen name="redaction_padding_start">16dp</dimen>



</resources>

res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -386,4 +386,10 @@ 
        <item name="android:gravity">center_vertical</item>

    </style>



    <style name="RedactionItemAndLabel">

        <item name="android:layout_marginTop">@dimen/redaction_vertical_margins</item>

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

        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>

    </style>



</resources>