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

Commit 21339533 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update notification dot color" into udc-dev

parents c6ebf62a 1406a0f6

res/values-v31/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
    <color name="popup_notification_dot_light">@android:color/system_accent1_100</color>

    <color name="popup_notification_dot_dark">@android:color/system_accent2_600</color>



    <color name="notification_dot_color_light">@android:color/system_accent3_200</color>

    <color name="notification_dot_color_dark">@android:color/system_accent3_100</color>



    <color name="workspace_text_color_light">@android:color/system_neutral1_0</color>

    <color name="workspace_text_color_dark">@android:color/system_neutral1_1000</color>
@@ -40,7 +43,6 @@ 


    <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>



    <color name="folder_dot_color">@android:color/system_accent3_100</color>

    <color name="folder_pagination_color_light">@android:color/system_accent1_600</color>

    <color name="folder_pagination_color_dark">@android:color/system_accent2_100</color>

res/values/attrs.xml

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
    <attr name="eduHalfSheetBGColor" format="color" />

    <attr name="overviewScrimColor" format="color" />

    <attr name="popupNotificationDotColor" format="color" />

    <attr name="notificationDotColor" format="color" />



    <attr name="folderDotColor" format="color" />

    <attr name="folderPaginationColor" format="color" />

    <attr name="folderPreviewColor" format="color" />

    <attr name="folderBackgroundColor" format="color" />
@@ -90,7 +90,6 @@ 
    <declare-styleable name="FolderIconPreview">

        <attr name="folderPreviewColor" />

        <attr name="folderIconBorderColor" />

        <attr name="folderDotColor" />

    </declare-styleable>



    <declare-styleable name="SearchResultSuggestion">

res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 
    <color name="popup_notification_dot_light">#FFF</color>

    <color name="popup_notification_dot_dark">#757575</color>



    <color name="notification_dot_color_light">#6DD58C</color>

    <color name="notification_dot_color_dark">#C4EED0</color>



    <color name="workspace_text_color_light">#FFF</color>

    <color name="workspace_text_color_dark">#FF000000</color>
@@ -66,7 +69,6 @@ 
    <color name="folder_preview_light">#F9F9F9</color>

    <color name="folder_preview_dark">#464746</color>



    <color name="folder_dot_color">?attr/colorPrimary</color>

    <color name="folder_pagination_color_light">#ff006c5f</color>

    <color name="folder_pagination_color_dark">#ffbfebe3</color>

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
        <item name="popupShadeSecond">@color/popup_shade_second_light</item>

        <item name="popupShadeThird">@color/popup_shade_third_light</item>

        <item name="popupNotificationDotColor">@color/popup_notification_dot_light</item>

        <item name="notificationDotColor">@color/notification_dot_color_light</item>

        <item name="isMainColorDark">false</item>

        <item name="isWorkspaceDarkText">false</item>

        <item name="workspaceTextColor">@color/workspace_text_color_light</item>
@@ -49,7 +50,6 @@ 
        <item name="workspaceKeyShadowColor">#89000000</item>

        <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>

        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

        <item name="folderDotColor">@color/folder_dot_color</item>

        <item name="folderPaginationColor">@color/folder_pagination_color_light</item>

        <item name="folderPreviewColor">@color/folder_preview_light</item>

        <item name="folderBackgroundColor">@color/folder_background_light</item>
@@ -109,8 +109,8 @@ 
        <item name="popupShadeFirst">@color/popup_shade_first_dark</item>

        <item name="popupShadeSecond">@color/popup_shade_second_dark</item>

        <item name="popupShadeThird">@color/popup_shade_third_dark</item>

        <item name="notificationDotColor">@color/notification_dot_color_dark</item>

        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

        <item name="folderDotColor">@color/folder_dot_color</item>

        <item name="folderPaginationColor">@color/folder_pagination_color_dark</item>

        <item name="folderPreviewColor">@color/folder_preview_dark</item>

        <item name="folderBackgroundColor">@color/folder_background_dark</item>

src/com/android/launcher3/BubbleTextView.java

+2 −2
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import com.android.launcher3.util.IntArray; 
import com.android.launcher3.util.MultiTranslateDelegate;

import com.android.launcher3.util.SafeCloseable;

import com.android.launcher3.util.ShortcutUtil;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.views.IconLabelDotView;
@@ -387,8 +388,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        }

        FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags);

        mDotParams.appColor = iconDrawable.getIconColor();

        mDotParams.dotColor = getContext().getResources()

                .getColor(android.R.color.system_accent3_200, getContext().getTheme());

        mDotParams.dotColor = Themes.getAttrColor(getContext(), R.attr.notificationDotColor);

        setIcon(iconDrawable);

        applyLabel(info);

    }