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

Commit b1850140 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing preview rendering in device search mode"

parents 3e1037d5 e733e799

res/layout/launcher_preview_layout.xml

+2 −17
Original line number Diff line number Diff line
@@ -29,23 +29,8 @@ 
        launcher:containerType="workspace"

        launcher:pageIndicator="@+id/page_indicator"/>



    <com.android.launcher3.Hotseat

        android:id="@+id/hotseat"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        android:theme="@style/HomeScreenElementTheme"

        launcher:containerType="hotseat" />



    <com.android.launcher3.InsettableFrameLayout

        android:id="@+id/apps_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent" >



    <include

            android:id="@id/search_container_all_apps"

            layout="@layout/search_container_all_apps"/>



    </com.android.launcher3.InsettableFrameLayout>

        android:id="@+id/hotseat"

        layout="@layout/hotseat" />



</com.android.launcher3.InsettableFrameLayout>
 
 No newline at end of file

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

+0 −11
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import com.android.launcher3.LauncherSettings; 
import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.R;

import com.android.launcher3.WorkspaceLayoutManager;

import com.android.launcher3.allapps.SearchUiManager;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.folder.FolderIcon;

import com.android.launcher3.icons.BaseIconFactory;
@@ -512,16 +511,6 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper 
            mWorkspace.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true);

        }



        // Setup search view

        SearchUiManager searchUiManager = mRootView.findViewById(R.id.search_container_all_apps);

        mRootView.findViewById(R.id.apps_view).setTranslationY(

                mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));

        ViewGroup searchView = (ViewGroup) searchUiManager;

        searchView.setEnabled(false);

        for (int i = 0; i < searchView.getChildCount(); i++) {

            searchView.getChildAt(i).setEnabled(false);

        }



        measureView(mRootView, mDp.widthPx, mDp.heightPx);

        dispatchVisibilityAggregated(mRootView, true);

        measureView(mRootView, mDp.widthPx, mDp.heightPx);