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

Commit 6e53e8c6 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch '3942-P-contact_editText_color_issue' into 'v1-pie' 

3942-P-contact_editText_color_issue

See merge request !63
parents 3a0ccdae 703cd311

res/layout-v23/edit_date_picker.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
<Button

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

    android:id="@+id/date_view"

    android:theme="@style/CustomEditTextTheme"

    style="@style/SpinnerButtonStyle"

    android:layout_width="match_parent"

    android:layout_height="@dimen/editor_min_line_item_height"

res/layout-v23/edit_spinner.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/spinner"

    android:layout_gravity="bottom|start"

    android:theme="@style/CustomEditTextTheme"

    style="@android:style/Widget.Material.Spinner.Underlined"

    android:layout_width="wrap_content"

    android:layout_height="@dimen/editor_min_line_item_height"

    android:paddingBottom="0dp"

    android:paddingTop="0dp"

    android:popupBackground="@color/color_default_background"

    android:popupBackground="@color/color_default_foreground"

    android:paddingEnd="@dimen/editor_spinner_right_padding_workaround"/>
 
 No newline at end of file

res/layout/date_picker.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
        android:paddingTop="5dip"

        android:paddingBottom="5dip"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:textColor="@color/color_default_primary_text"

        android:layout_gravity="center_horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

res/layout/edit_date_picker.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
<Button

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

    android:id="@+id/date_view"

    android:theme="@style/CustomEditTextTheme"

    style="@style/SpinnerButtonStyle"

    android:layout_width="match_parent"

    android:layout_height="@dimen/editor_min_line_item_height"

res/layout/edit_spinner.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ 
<Spinner

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

    android:id="@+id/spinner"

    android:theme="@style/CustomEditTextTheme"

    android:layout_gravity="bottom|start"

    android:layout_width="wrap_content"

    android:layout_height="@dimen/editor_min_line_item_height"

    android:paddingBottom="0dp"

    android:paddingTop="0dp"

    android:popupBackground="@color/color_default_background"

    android:popupBackground="@color/color_default_foreground"

    android:paddingRight="@dimen/editor_spinner_right_padding"/>
 
 No newline at end of file