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

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

Merge "Removes duplicated checkbox and fixes text alignment." into nyc-dev

parents e2634016 c8787937

res/layout/redaction_interstitial.xml

+1 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
            android:layout_marginTop="@dimen/redaction_vertical_margins"

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

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

            android:text="@string/lockscreen_remote_input"

            android:textAppearance="?android:attr/textAppearanceMedium" />

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



</LinearLayout>
 
 No newline at end of file

res/layout/setup_redaction_interstitial.xml

+7 −17
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


        <RadioGroup

            android:id="@+id/radio_group"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/redaction_vertical_margins"

            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
@@ -72,26 +72,16 @@ 
                android:layout_height="wrap_content"

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



            <!-- CheckBox is styled with SuwRadioButton to make it line up nicely with the radios

                 above. -->

            <CheckBox

                android:id="@+id/lockscreen_remote_input"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/suw_check_box_margin_top"

                android:text="@string/lockscreen_remote_input"

                style="@style/SuwRadioButton" />

        </RadioGroup>



            <!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of

                 SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->

            <CheckBox

                android:id="@+id/lockscreen_remote_input"

            style="@style/SuwCheckBox"

            android:layout_width="match_parent"

                style="@style/SuwRadioButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

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

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

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

        </RadioGroup>



    </LinearLayout>