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

Commit d38c33d6 authored by Kshitij's avatar Kshitij
Browse files

fix!: Resolve build issues after tablet rebase

parent acc4b333
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Path;
import android.graphics.Rect;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;

import androidx.annotation.NonNull;
+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.launcher3.Insettable;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.apppairs.AppPairIcon;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.folder.FolderIcon;
import com.android.launcher3.folder.PreviewBackground;
import com.android.launcher3.model.data.FolderInfo;
+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.graphics.Bitmap;
import android.graphics.Point;
import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Message;
@@ -124,6 +125,7 @@ import com.android.launcher3.util.RunnableList;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.WallpaperOffsetInterpolator;
import com.android.launcher3.util.window.WindowManagerProxy;
import com.android.launcher3.views.FloatingIconView;
import com.android.launcher3.widget.LauncherAppWidgetHostView;
import com.android.launcher3.widget.LauncherWidgetHolder;
import com.android.launcher3.widget.LauncherWidgetHolder.ProviderChangedListener;
@@ -432,7 +434,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
        mPageIndicator.setLayoutParams(lp);
    }

    private void updateCellLayoutPadding() {
    private void updateCellLayoutMeasures() {
        DeviceProfile grid = mLauncher.getDeviceProfile();
        Rect padding = grid.cellLayoutPaddingPx;
        setOrientation(mLauncher);
+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ public final class FeatureFlags {
    // List of assigned blocks can be found: http://go/gnl-flags-block-directory

    public static final BooleanFlag ENABLE_TASKBAR_ALLAPPS = getDebugFlag(-1,
            "ENABLE_TASKBAR_ALLAPPS", false,
            "ENABLE_TASKBAR_ALLAPPS", DISABLED,
            "Enables all apps button in taskbar");

    public static class BooleanFlag {