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

Commit d9a5d343 authored by Sam Blitzstein's avatar Sam Blitzstein
Browse files

Fix long ringtone overlap with vibrate setting. 

Bug: 10734168
Change-Id: Ib1e3ed5539ae82d3546769541bf25ac86c38b9d3
(cherry picked from commit 910a2f7e)
parent 249d6373

res/layout/alarm_time.xml

+9 −3
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ 
                android:visibility="gone">

                android:visibility="gone">

                <!-- Day buttons are put here programatically -->

                <!-- Day buttons are put here programatically -->

            </LinearLayout>

            </LinearLayout>

            <FrameLayout

            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="64dp"

                android:layout_height="64dp"

                android:layout_marginLeft="10dp"

                android:layout_marginLeft="10dp"
@@ -177,6 +177,10 @@ 
                    android:drawableLeft="@drawable/ic_ringtone"

                    android:drawableLeft="@drawable/ic_ringtone"

                    android:drawableStart="@drawable/ic_ringtone"

                    android:drawableStart="@drawable/ic_ringtone"

                    android:drawablePadding="2dp"

                    android:drawablePadding="2dp"

                    android:layout_alignParentLeft="true"

                    android:layout_alignParentStart="true"

                    android:layout_toLeftOf="@+id/vibrate_onoff"

                    android:layout_toStartOf="@+id/vibrate_onoff"

                    />

                    />

                <CheckBox

                <CheckBox

                    android:id="@+id/vibrate_onoff"

                    android:id="@+id/vibrate_onoff"
@@ -185,9 +189,11 @@ 
                    android:textColor="@color/clock_gray"

                    android:textColor="@color/clock_gray"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_gravity="center_vertical|end"

                    android:layout_alignParentRight="true"

                    android:layout_alignParentEnd="true"

                    android:layout_centerVertical="true"

                    style="@style/body"/>

                    style="@style/body"/>

            </FrameLayout>

            </RelativeLayout>

        </LinearLayout>

        </LinearLayout>

        <FrameLayout

        <FrameLayout

            android:id="@+id/collapse_expand"

            android:id="@+id/collapse_expand"