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

Commit c9f59784 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '3776-Fix_Dialog_based_activity_views' into 'master' 

3776-OREO-Fix_Dialog_based_activity_views

See merge request e/apps/calendar!40
parents 64f645de 42a6f8b2

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -206,20 +206,20 @@ 
            android:name="com.android.calendar.alerts.AlertActivity"

            android:excludeFromRecents="true"

            android:launchMode="singleInstance"

            android:theme="@android:style/Theme.Holo.Dialog" />

            android:theme="@style/customDialogStyle" />



        <activity

            android:name="com.android.calendar.alerts.QuickResponseActivity"

            android:excludeFromRecents="true"

            android:label="@string/quick_response_dialog_title"

            android:launchMode="singleInstance"

            android:theme="@android:style/Theme.Holo.Dialog" />

            android:theme="@style/customDialogStyle" />



        <activity

            android:name="com.android.calendar.alerts.SnoozeDelayActivity"

            android:excludeFromRecents="true"

            android:launchMode="singleInstance"

            android:theme="@android:style/Theme.Holo.Dialog" />

            android:theme="@style/customDialogStyle" />



        <receiver android:name="com.android.calendar.alerts.AlertReceiver">

            <intent-filter>

res/drawable/recurrence_day_view_text_color.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    <item android:state_enabled="true" android:state_checked="true" android:color="@color/color_default_view_on_accent"/>

    <item android:state_enabled="true" android:state_checked="false" android:color="@color/color_default_primary_text"/>

    <item android:color="@color/color_default_secondary_text" />

</selector>

res/layout/alert_activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            style="?android:attr/buttonBarButtonStyle"

            android:textColor="@color/colorAccent"

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

    </LinearLayout>

</LinearLayout>

res/layout/alert_item.xml

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
            android:id="@+id/event_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@color/color_default_primary_text"

            android:ellipsize="end"

            android:maxLines="2"

            android:textSize="18sp" />
@@ -58,6 +59,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:textColor="@color/color_default_secondary_text"

            android:ellipsize="end"

            android:maxLines="1"

            android:textSize="14sp" />
@@ -69,6 +71,7 @@ 
            android:layout_gravity="center_vertical"

            android:layout_marginLeft="5dip"

            android:src="@drawable/ic_repeat_dark"

            android:tint="@color/colorAccent"

            android:focusable="false"

            android:clickable="false" />

    </LinearLayout>
@@ -78,6 +81,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="44dip"

        android:textColor="@color/color_default_secondary_text"

        android:ellipsize="end"

        android:maxLines="1"

        android:textSize="14sp" />

res/layout/quick_response_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:textColor="@color/color_default_primary_text"

    android:gravity="center_vertical"

    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"

    android:paddingRight="?android:attr/listPreferredItemPaddingRight"