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

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

Fix up layout changes as per redlines. 

Change-Id: I3f48a9e919312a99b455cd8634b749dc6cbffcc5
parent 76b9837c

res/drawable/footer_bg.xml

+4 −1
Original line number Diff line number Diff line
@@ -16,5 +16,8 @@ 


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

    android:shape="rectangle">

    <solid android:color="@color/blackish_trans"/>

    <gradient

        android:angle="90"

        android:startColor="@color/blackish"

        android:endColor="@color/blackish_trans" />

</shape>

res/layout/alarm_clock.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:clipToPadding="false"

        android:descendantFocusability="beforeDescendants"

        android:divider="@null"

        android:dividerHeight="6dp"

        android:dividerHeight="0dp"

        />

    <TextView

        android:id="@+id/alarms_empty_view"

res/layout/alarm_time.xml

+6 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
        android:layout_marginRight="12dp"

        android:layout_marginEnd="12dp"

        android:layout_marginTop="12dp"

        android:layout_marginBottom="12dp"

        android:orientation="horizontal">

        <com.android.deskclock.DigitalClock

            android:id="@+id/digital_clock"
@@ -46,17 +45,19 @@ 
                android:id="@+id/timeDisplayHours"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingRight="@dimen/time_margin_right"

                android:paddingEnd="@dimen/time_margin_right"

                android:paddingRight="@dimen/mini_time_margin_right"

                android:paddingEnd="@dimen/mini_time_margin_right"

                android:singleLine="true"

                android:ellipsize="none"

                style="@style/small_light"

                android:textSize="@dimen/alarm_time_font_size"

                android:textColor="@color/clock_white"/>

            <TextView

                android:id="@+id/timeDisplayMinutes"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/small_light"

                android:textSize="@dimen/alarm_time_font_size"

                android:singleLine="true"

                android:ellipsize="none"

                android:textColor="@color/clock_white" />
@@ -65,9 +66,10 @@ 
                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                style="@style/label"

                android:paddingLeft="6dp"

                android:paddingStart="6dp"

                android:singleLine="true"

                android:ellipsize="none"

                android:fontFamily="sans-serif-light"

                android:textColor="@color/clock_white" />

        </com.android.deskclock.DigitalClock>

        <Space

res/layout/desk_clock_saver.xml

+43 −42
Original line number Diff line number Diff line
@@ -42,21 +42,20 @@ 
            android:layout_height="wrap_content"

            android:gravity="center"

            android:layout_gravity="center"

        android:layout_marginBottom="@dimen/digital_margin_bottom"

            android:layout_marginBottom="@dimen/bottom_text_spacing_digital"

            />

        <com.android.deskclock.AnalogClock

            android:id="@+id/analog_clock"

        android:layout_width="@dimen/analog_clock_diameter"

        android:layout_height="@dimen/analog_clock_diameter"

        android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            dc:jewelRadius="5dp"

            dc:jewelOffset="23dp"

            dc:jewelColor="@color/clock_white"

            android:dial="@drawable/clock_analog_dial_mipmap"

            android:hand_hour="@drawable/clock_analog_hour_mipmap"

            android:hand_minute="@drawable/clock_analog_minute_mipmap"

        android:layout_marginBottom="@dimen/time_margin_bottom"/>



            android:layout_marginBottom="@dimen/bottom_text_spacing_analog" />

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -67,6 +66,7 @@ 
                android:layout_height="wrap_content"

                android:textColor="@color/clock_white"

                style="@style/label"

                android:textSize="@dimen/bottom_text_size"

                android:gravity="center"

                android:visibility="gone"

                />
@@ -78,6 +78,7 @@ 
                android:drawableStart="@drawable/ic_alarm_small"

                android:textColor="@color/clock_gray"

                style="@style/label"

                android:textSize="@dimen/bottom_text_size"

                android:layout_marginLeft="8dip"

                android:layout_marginStart="8dip"

                android:gravity="center"

res/layout/desk_clock_time_date.xml

+3 −1
Original line number Diff line number Diff line
@@ -50,10 +50,12 @@ 
            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            style="@style/label"

            android:paddingLeft="8dp"

            android:paddingStart="8dp"

            android:singleLine="true"

            android:ellipsize="none"

            android:gravity="top"

            android:fontFamily="sans-serif-light"

            android:textSize="@dimen/main_ampm_font_size"

            android:textColor="@color/clock_white" />



    </com.android.deskclock.DigitalClock>