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

Commit 5455bb54 authored by Adrian Roos's avatar Adrian Roos
Browse files

Ensure redaction settings are visible on narrow screens 

Bug: 18599040
Change-Id: I852f8fa317927f6f786b33f965e9d1feab562518
parent bc614dfc

res/layout/redaction_interstitial.xml

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:layout_marginTop="@dimen/redaction_vertical_margins"

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

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

            android:text="@string/lock_screen_notifications_interstitial_message"
@@ -35,7 +35,7 @@ 
    <RadioGroup

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:layout_marginTop="@dimen/redaction_vertical_margins"

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

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

            android:checkedButton="@+id/redact_sensitive">
@@ -44,21 +44,21 @@ 
                android:id="@+id/show_all"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

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



        <RadioButton

                android:id="@+id/redact_sensitive"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

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



        <RadioButton

                android:id="@+id/hide_all"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:layout_marginTop="@dimen/redaction_vertical_margins"

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



    </RadioGroup>

res/values-h330dp/dimens.xml

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

<!-- Copyright (C) 2015 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>

    <!-- RedactionInterstitial -->

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

</resources>
 
 No newline at end of file

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -230,4 +230,7 @@ 
    <dimen name="color_swatch_size">16dp</dimen>

    <dimen name="color_swatch_stroke_width">4dp</dimen>



    <!-- RedactionInterstitial -->

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



</resources>