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

Commit a51ef571 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Automerger Merge Worker
Browse files

Merge "Adding color back to popup container." into sc-dev am: d88f5728

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14796372

Change-Id: If0211bbefae257d97e7b652acff0b569bf088b4d
parents 877e193e d88f5728
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
-->
<com.android.launcher3.views.OptionsPopupView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/deep_shortcuts_container"
    android:id="@+id/popup_container"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:clipToPadding="false"
+10 −1
Original line number Diff line number Diff line
@@ -16,12 +16,21 @@

<com.android.launcher3.popup.PopupContainerWithArrow
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/deep_shortcuts_container"
    android:id="@+id/popup_container"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:clipToPadding="false"
    android:clipChildren="false"
    android:orientation="vertical">

    <LinearLayout
        android:id="@+id/deep_shortcuts_container"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:tag="@string/popup_container_iterate_children"
        android:elevation="@dimen/deep_shortcuts_elevation"
        android:orientation="vertical"/>

    <LinearLayout
        android:id="@+id/notification_container"
        android:layout_width="match_parent"
+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@
*/
-->
<resources>
    <color name="popup_color_primary_light">@android:color/system_neutral1_0</color>
    <color name="popup_color_primary_light">@android:color/system_accent2_50</color>
    <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
    <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
    <color name="popup_color_neutral_dark">@android:color/system_neutral1_1000</color>
    <color name="popup_color_primary_dark">@android:color/system_neutral1_800</color>
    <color name="popup_color_primary_dark">@android:color/system_neutral2_800</color>
    <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
    <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@
    <!-- View tag key used to store SpringAnimation data. -->
    <item type="id" name="spring_animation_tag" />

    <!-- View tag key used to determine if we should fade in the child views.. -->
    <string name="popup_container_iterate_children" translatable="false">popup_container_iterate_children</string>

    <!-- Workspace -->
    <!-- The duration (in ms) of the fade animation on the object outlines, used when
         we are dragging objects around on the home screen. -->
+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.notification;

import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;

import android.animation.AnimatorSet;
import android.app.Notification;
import android.content.Context;
import android.graphics.Color;
@@ -92,6 +93,15 @@ public class NotificationItemView {
        });
    }

    /**
     * Animates the background color to a new color.
     * @param color The color to change to.
     * @param animatorSetOut The AnimatorSet where we add the color animator to.
     */
    public void updateBackgroundColor(int color, AnimatorSet animatorSetOut) {
        mMainView.updateBackgroundColor(color, animatorSetOut);
    }

    public void addGutter() {
        if (mGutter == null) {
            mGutter = mPopupContainer.inflateAndAdd(R.layout.notification_gutter, mRootView);
Loading