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

Commit 3a0ccdae authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch '3943-P-alertDialog_background_color_issue' into 'v1-pie' 

3943-P-alertDialog_background_color_issue

See merge request !60
parents 804528b4 a38785b5

res/layout/account_selector_list_item_condensed.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="72dp"

    android:layout_height="72dp"

    android:background="@color/color_default_foreground"

    android:orientation="horizontal">

    android:orientation="horizontal">

    <ImageView android:id="@android:id/icon"

    <ImageView android:id="@android:id/icon"

        android:layout_width="@dimen/detail_network_icon_size"

        android:layout_width="@dimen/detail_network_icon_size"
@@ -49,7 +50,7 @@ 
            android:layout_marginEnd="24dp"

            android:layout_marginEnd="24dp"

            android:textSize="14sp"

            android:textSize="14sp"

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

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

            android:textColor="?android:attr/textColorSecondary"

            android:textColor="@color/secondary_text_color"

            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="end"/>

            android:ellipsize="end"/>

res/values/colors.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -260,7 +260,7 @@ 
    <color name="drawer_divider_color">@color/divider_line_color_light</color>

    <color name="drawer_divider_color">@color/divider_line_color_light</color>





    <!-- Background color for the navigation drawer -->

    <!-- Background color for the navigation drawer -->

    <color name="navigation_drawer_background_color">@color/primary_color_dark</color>

    <color name="navigation_drawer_background_color">@color/color_default_foreground</color>





    <!-- Background color for the current selected item in the navigation drawer -->

    <!-- Background color for the current selected item in the navigation drawer -->

    <color name="drawer_selected_color">@color/selection_color</color>

    <color name="drawer_selected_color">@color/selection_color</color>

res/values/styles.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -361,7 +361,9 @@ 




    <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar"></style>

    <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar"></style>





    <style name="NonPhoneDialogTheme" parent="@android:Theme.Material.Light.Dialog"></style>

    <style name="NonPhoneDialogTheme" parent="@android:Theme.Material.Light.Dialog">

        <item name="android:background">@color/color_default_foreground</item>

    </style>





    <style name="ConfirmAddDetailDialogTheme" parent="@android:style/Theme.Material.Light.Dialog.MinWidth">

    <style name="ConfirmAddDetailDialogTheme" parent="@android:style/Theme.Material.Light.Dialog.MinWidth">

        <item name="android:windowCloseOnTouchOutside">true</item>

        <item name="android:windowCloseOnTouchOutside">true</item>
@@ -416,7 +418,7 @@ 
        since the Alert dialog is private. They are identical anyway. -->

        since the Alert dialog is private. They are identical anyway. -->

    <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">

    <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">

        <item name="android:colorAccent">@color/accent</item>

        <item name="android:colorAccent">@color/accent</item>

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@color/color_default_foreground</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

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

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

        <item name="android:colorPrimary">@color/primary_color</item>

        <item name="android:colorPrimary">@color/primary_color</item>
@@ -428,7 +430,7 @@ 
    <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">

    <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">

        <item name="android:colorAccent">@color/accent</item>

        <item name="android:colorAccent">@color/accent</item>

        <item name="colorAccent">@color/accent</item>

        <item name="colorAccent">@color/accent</item>

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@color/color_default_foreground</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

        <item name="android:textColorPrimary">@color/color_default_primary_text</item>

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

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

        <item name="android:colorPrimary">@color/primary_color</item>

        <item name="android:colorPrimary">@color/primary_color</item>

src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -203,7 +203,7 @@ public class ContactEditorAccountsChangedActivity extends Activity 
        if (mDialog != null && mDialog.isShowing()) {

        if (mDialog != null && mDialog.isShowing()) {

            mDialog.dismiss();

            mDialog.dismiss();

        }

        }

        mDialog = new AlertDialog.Builder(this)

        mDialog = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)

                .setView(view)

                .setView(view)

                .setOnCancelListener(new DialogInterface.OnCancelListener() {

                .setOnCancelListener(new DialogInterface.OnCancelListener() {

                    @Override

                    @Override

src/com/android/contacts/activities/ShowOrCreateActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ public final class ShowOrCreateActivity extends ContactsActivity 
                final CharSequence message = getResources().getString(

                final CharSequence message = getResources().getString(

                        R.string.add_contact_dlg_message_fmt, mCreateDescrip);

                        R.string.add_contact_dlg_message_fmt, mCreateDescrip);





                return new AlertDialog.Builder(this)

                return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)

                        .setMessage(message)

                        .setMessage(message)

                        .setPositiveButton(android.R.string.ok,

                        .setPositiveButton(android.R.string.ok,

                                new IntentClickListener(this, createIntent))

                                new IntentClickListener(this, createIntent))