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

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

Merge "Using xml override instead of code swap for predicted icon" into main

parents 43879a72 bd7ec333

quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.uioverrides;



import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import com.android.launcher3.R;

import com.android.launcher3.model.data.WorkspaceItemInfo;



/** A util class that inflates a predicted app icon */

public class PredictedAppIconInflater {

    public static View inflate(LayoutInflater inflater, ViewGroup parent, WorkspaceItemInfo info) {

        PredictedAppIcon icon = (PredictedAppIcon) inflater.inflate(

                R.layout.predicted_app_icon, parent, false);

        icon.applyFromWorkspaceItem(info);

        return icon;

    }

}

res/layout/predicted_app_icon.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<com.android.launcher3.views.DoubleShadowBubbleTextView style="@style/BaseIcon.Workspace" />

src/com/android/launcher3/graphics/LauncherPreviewRenderer.java

+4 −5
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; 
import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.pm.InstallSessionHelper;

import com.android.launcher3.pm.UserCache;

import com.android.launcher3.uioverrides.PredictedAppIconInflater;

import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.DisplayController;
@@ -453,10 +452,10 @@ public class LauncherPreviewRenderer extends ContextWrapper 


    private void inflateAndAddPredictedIcon(WorkspaceItemInfo info) {

        CellLayout screen = mWorkspaceScreens.get(info.screenId);

        View view = PredictedAppIconInflater.inflate(mHomeElementInflater, screen, info);

        if (view != null) {

            addInScreenFromBind(view, info);

        }

        BubbleTextView icon = (BubbleTextView) mHomeElementInflater.inflate(

                R.layout.predicted_app_icon, screen, false);

        icon.applyFromWorkspaceItem(info);

        addInScreenFromBind(icon, info);

    }



    private void dispatchVisibilityAggregated(View view, boolean isVisible) {

src_ui_overrides/com/android/launcher3/uioverrides/PredictedAppIconInflater.java

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.uioverrides;



import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import com.android.launcher3.model.data.WorkspaceItemInfo;



/** A util class that inflates a predicted app icon */

public class PredictedAppIconInflater {

    public static View inflate(LayoutInflater inflater, ViewGroup parent, WorkspaceItemInfo info) {

        return null;

    }

}