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

Commit ef4fc988 authored by Mindy Pereira's avatar Mindy Pereira Committed by Android (Google) Code Review
Browse files

Merge "Add padding to the left side of attendees for phone; fixup calendar selector" into jb-dev

parents 031b14c2 2a1fb353
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -18,24 +18,28 @@
    android:orientation="horizontal"
    android:gravity="center_vertical"
    android:layout_height="wrap_content"
    android:layout_width="match_parent">
    android:layout_width="match_parent"
    android:paddingBottom="8dp"
    android:paddingLeft="8dp"
    android:paddingTop="8dp">

    <View android:id="@+id/color"
        android:layout_width="16dip"
        android:layout_height="16dip"
        android:layout_marginRight="4dip"
        android:layout_marginTop="8dip"
        android:layout_marginTop="5dip"
    />

    <TextView
        android:id="@+id/calendar_name"
        style="?android:attr/textAppearanceLarge"
        style="?android:attr/textAppearanceMedium"
        android:singleLine="true"
        android:layout_width="match_parent"
        android:ellipsize="marquee"
        android:layout_toRightOf="@id/color"
        android:layout_alignParentTop="true"
        android:layout_height="wrap_content"
        android:textColor="#FF000000"
        android:textColor="#333333"
    />

    <TextView
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginLeft="7dip"
    android:paddingLeft="4dip"
    android:orientation="vertical">
    <LinearLayout
        android:layout_width="match_parent"
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@
    <color name="panel_text_foreground">#ffffffff</color>
    <color name="calendar_event_text_color">#ffFFFFFF</color>

    <color name="calendar_owner_text_color">#ffbebebe</color>
    <color name="calendar_owner_text_color">#777777</color>
    <color name="calendar_date_range_color">#80000000</color>