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

Commit 42170e3a authored by Budi Kusmiantoro's avatar Budi Kusmiantoro
Browse files

Adjust contrast ratio for Clock for GAR 

Bug: 17525736
Change-Id: I4f6c9f67887ce4ae9a356f7084529922333a30a8
parent c5deecb3

res/layout/alarm_time.xml

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
                    android:text="@string/alarm_vibrate"

                    android:paddingStart="16dip"

                    android:textSize="16sp"

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

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

            </LinearLayout>



            <TextView
@@ -143,7 +143,7 @@ 
                android:paddingTop="12dp"

                android:singleLine="true"

                android:textSize="16sp"

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

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



            <View

                android:layout_width="match_parent"

res/layout/city_list_item.xml

+3 −5
Original line number Diff line number Diff line
@@ -37,20 +37,18 @@ 
        android:clickable="false" />

    <TextView

        android:id="@+id/city_name"

        style="@style/city_name"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingStart="16dip"

        android:paddingEnd="10dip"

        android:textColor="@color/clock_white"

        android:ellipsize="end"

        android:singleLine="true" />

        android:singleLine="true"

        android:textAppearance="@style/PrimaryLabelTextAppearance" />

    <TextView

        android:id="@+id/city_time"

        style="@style/city_time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginRight="8dip"

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

        android:textAppearance="@style/SecondaryLabelTextAppearance" />

</LinearLayout>

res/layout/lap_view.xml

+6 −9
Original line number Diff line number Diff line
@@ -25,32 +25,29 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    <TextView

        android:id="@+id/lap_number"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/clock_gray"

        android:layout_marginRight="@dimen/sw_item_space"

        android:layout_marginEnd="@dimen/sw_item_space"

        android:gravity="start"

        style="@style/body"

        android:textAllCaps="false"

        android:id="@+id/lap_number" />

        android:textAppearance="@style/SecondaryLabelTextAppearance" />

    <TextView

        android:id="@+id/lap_time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginRight="@dimen/sw_item_space"

        android:layout_marginEnd="@dimen/sw_item_space"

        android:textColor="@color/clock_gray"

        android:gravity="end"

        style="@style/body"

        android:textAllCaps="false"

        android:id="@+id/lap_time" />

        android:textAppearance="@style/PrimaryLabelTextAppearance" />

    <TextView

        android:id="@+id/lap_total"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:textColor="@color/clock_gray"

        android:gravity="end"

        style="@style/body"

        android:textAllCaps="false"

        android:id="@+id/lap_total" />

        android:textAppearance="@style/PrimaryLabelTextAppearance" />

</LinearLayout>

res/layout/main_clock_frame.xml

+4 −10
Original line number Diff line number Diff line
@@ -56,24 +56,18 @@ 
        <TextView android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@color/clock_white"

            style="@style/label"

            android:textSize="@dimen/bottom_text_size"

            android:gravity="center"

            />

            android:textAppearance="@style/PrimaryLabelTextAppearance" />

        <TextView android:id="@+id/nextAlarm"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="8dip"

            android:layout_marginStart="8dip"

            android:drawablePadding="2dip"

            android:drawableLeft="@drawable/ic_alarm_small"

            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"

            />

            android:textAppearance="@style/SecondaryLabelTextAppearance" />

    </LinearLayout>



    <View

res/layout/timer_list_item.xml

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 


            <TextView

                android:id="@+id/timer_label_text"

                style="@style/timer_label"

                android:layout_width="wrap_content"

                android:layout_height="56dip"

                android:layout_gravity="center_horizontal"
@@ -61,18 +60,19 @@ 
                android:enabled="false"

                android:gravity="center"

                android:singleLine="true"

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

                android:text="@string/label_unlabeled"

                android:textAppearance="@style/SecondaryLabelTextAppearance" />



            <TextView

                android:id="@+id/timer_label_placeholder"

                style="@style/timer_label"

                android:layout_width="wrap_content"

                android:layout_height="56dip"

                android:layout_gravity="center_horizontal"

                android:contentDescription="@string/label"

                android:enabled="false"

                android:src="@drawable/ic_label"

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

                android:text="@string/label"

                android:textAppearance="@style/SecondaryLabelTextAppearance" />

        </FrameLayout>



        <ImageButton