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

Commit 7fdfcbff authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8200697 from 0fb7fa4e to sc-qpr3-release 

Change-Id: Ic090ca93d710c3170b3d8249c344a07c97f8eb8f
parents 6d532b68 0fb7fa4e

res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> oder mehr Elemente"</string>

    <string name="wallpaper_button_text" msgid="8404103075899945851">"Hintergründe"</string>

    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Hintergrund &amp; Stil"</string>

    <string name="settings_button_text" msgid="8873672322605444408">"Startbildschirm-Einstellungen"</string>

    <string name="settings_button_text" msgid="8873672322605444408">"Einstellungen"</string>

    <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Von deinem Administrator deaktiviert"</string>

    <string name="allow_rotation_title" msgid="7728578836261442095">"Drehen des Startbildschirms zulassen"</string>

    <string name="allow_rotation_desc" msgid="8662546029078692509">"Beim Drehen des Smartphones"</string>

src/com/android/launcher3/views/FloatingIconView.java

+7 −5
Original line number Diff line number Diff line
@@ -564,6 +564,12 @@ public class FloatingIconView extends FrameLayout implements 
                launcher, parent);

        view.recycle();



        // Init properties before getting the drawable.

        view.mIsVerticalBarLayout = launcher.getDeviceProfile().isVerticalBarLayout();

        view.mIsOpening = isOpening;

        view.mOriginalIcon = originalView;

        view.mPositionOut = positionOut;



        // Get the drawable on the background thread

        boolean shouldLoadIcon = originalView.getTag() instanceof ItemInfo && hideOriginal;

        if (shouldLoadIcon) {
@@ -577,11 +583,6 @@ public class FloatingIconView extends FrameLayout implements 
        }

        sIconLoadResult = null;



        view.mIsVerticalBarLayout = launcher.getDeviceProfile().isVerticalBarLayout();

        view.mIsOpening = isOpening;

        view.mOriginalIcon = originalView;

        view.mPositionOut = positionOut;



        // Match the position of the original view.

        view.matchPositionOf(launcher, originalView, isOpening, positionOut);
@@ -639,6 +640,7 @@ public class FloatingIconView extends FrameLayout implements 
        mLoadIconSignal = null;

        mEndRunnable = null;

        mFinalDrawableBounds.setEmpty();

        mIsOpening = false;

        mPositionOut = null;

        mListenerView.setListener(null);

        mOriginalIcon = null;