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

Commit 2b63a621 authored by Tony's avatar Tony Committed by android-build-merger
Browse files

Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801ea

am: 6df10a64

Change-Id: I4d922182ef9307b2d93b4120c425413a73285632
parents 5a78ad8c 6df10a64
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@

        <service android:name="com.android.launcher3.dynamicui.ColorExtractionService"
            android:exported="false"
            android:process=":wallpaper_chooser">
            android:process=":wallpaper_chooser"
            android:permission="android.permission.BIND_JOB_SERVICE">
        </service>

        <service android:name="com.android.launcher3.notification.NotificationListener"
+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@
    <string name="widget_resized" msgid="9130327887929620">"ウィジェットのサイズを幅<xliff:g id="NUMBER_0">%1$s</xliff:g>、高さ<xliff:g id="NUMBER_1">%2$s</xliff:g>に変更しました"</string>
    <string name="action_deep_shortcut" msgid="2864038805849372848">"ショートカット"</string>
    <string name="shortcuts_menu_description" msgid="406159963824238648">"<xliff:g id="APP_NAME">%2$s</xliff:g>用の <xliff:g id="NUMBER_OF_SHORTCUTS">%1$d</xliff:g> 件のショートカット"</string>
    <string name="shortcuts_menu_with_notifications_description" msgid="8985659504915468840">"<xliff:g id="APP_NAME">%3$s</xliff:g>: <xliff:g id="NUMBER_OF_SHORTCUTS">%1$d</xliff:g> のショートカットと <xliff:g id="NUMBER_OF_NOTIFICATIONS">%2$d</xliff:g> 件の通知"</string>
    <string name="shortcuts_menu_with_notifications_description" msgid="8985659504915468840">"<xliff:g id="APP_NAME">%3$s</xliff:g>: <xliff:g id="NUMBER_OF_SHORTCUTS">%1$d</xliff:g> のショートカットと <xliff:g id="NUMBER_OF_NOTIFICATIONS">%2$d</xliff:g> 件の通知"</string>
    <string name="action_dismiss_notification" msgid="5909461085055959187">"表示しない"</string>
    <string name="notification_dismissed" msgid="6002233469409822874">"通知を非表示にしました"</string>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@
    <color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->

    <color name="badge_color">#1DE9B6</color> <!-- Teal A400 -->
    <color name="folder_badge_color">#1DE9B6</color> <!-- Teal A400 -->

    <!-- System shortcuts -->
    <color name="system_shortcuts_icon_color">@android:color/tertiary_text_light</color>
+4 −4
Original line number Diff line number Diff line
@@ -172,12 +172,12 @@
    <string name="allow_rotation_desc">When phone is rotated</string>
    <!-- Text explaining that rotation is disabled in Display settings. 'Display' refers to the Display section in system settings [CHAR LIMIT=100] -->
    <string name="allow_rotation_blocked_desc">Current Display setting doesn\'t permit rotation</string>
    <!-- Title for Icon Badging setting. Tapping this will link to the system Notifications Settings screen where the user can turn off badging globally. [CHAR LIMIT=50] -->
    <string name="icon_badging_title">Icon badging</string>
    <!-- Title for Notification dots setting. Tapping this will link to the system Notifications settings screen where the user can turn off notification dots globally. [CHAR LIMIT=50] -->
    <string name="icon_badging_title">Notification dots</string>
    <!-- Text to indicate that the system icon badging setting is on [CHAR LIMIT=100] -->
    <string name="icon_badging_desc_on">On for all apps</string>
    <string name="icon_badging_desc_on">On</string>
    <!-- Text to indicate that the system icon badging setting is off [CHAR LIMIT=100] -->
    <string name="icon_badging_desc_off">Off for all apps</string>
    <string name="icon_badging_desc_off">Off</string>

    <!-- Label for the setting that allows the automatic placement of launcher shortcuts for applications and games installed on the device [CHAR LIMIT=40] -->
    <string name="auto_add_shortcuts_label">Add icon to Home screen</string>
+10 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver {

    private BadgeInfo mBadgeInfo;
    private BadgeRenderer mBadgeRenderer;
    private IconPalette mIconPalette;
    private IconPalette mBadgePalette;
    private float mBadgeScale;
    private boolean mForceHideBadge;
    private Point mTempSpaceForBadgeOffset = new Point();
@@ -453,7 +453,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver {
            final int scrollX = getScrollX();
            final int scrollY = getScrollY();
            canvas.translate(scrollX, scrollY);
            mBadgeRenderer.draw(canvas, mBadgeInfo, mTempIconBounds, mBadgeScale,
            mBadgeRenderer.draw(canvas, mBadgePalette, mBadgeInfo, mTempIconBounds, mBadgeScale,
                    mTempSpaceForBadgeOffset);
            canvas.translate(-scrollX, -scrollY);
        }
@@ -578,7 +578,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver {
            float newBadgeScale = isBadged ? 1f : 0;
            mBadgeRenderer = mLauncher.getDeviceProfile().mBadgeRenderer;
            if (wasBadged || isBadged) {
                mIconPalette = ((FastBitmapDrawable) mIcon).getIconPalette();
                mBadgePalette = IconPalette.getBadgePalette(getResources());
                if (mBadgePalette == null) {
                    mBadgePalette = ((FastBitmapDrawable) mIcon).getIconPalette();
                }
                // Animate when a badge is first added or when it is removed.
                if (animate && (wasBadged ^ isBadged) && isShown()) {
                    ObjectAnimator.ofFloat(this, BADGE_SCALE_PROPERTY, newBadgeScale).start();
@@ -590,6 +593,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver {
        }
    }

    public IconPalette getBadgePalette() {
        return mBadgePalette;
    }

    /**
     * Sets the icon for this view based on the layout direction.
     */
Loading