mirror of
https://github.com/alesimula/Murine-launcher.git
synced 2026-10-28 09:43:42 +00:00
BUILD - removed androidx.slice dependency
This commit is contained in:
1 parent
a0f8c7694a
commit
328051b177
3 files changed
+12
-12
No files matched your search
+1
-1
@@ -317,7 +317,7 @@ dependencies {
|
||||
implementation libs.androidx.recyclerview
|
||||
implementation libs.androidx.dynamicanimation
|
||||
implementation libs.androidx.preference
|
||||
implementation libs.androidx.slice.builders
|
||||
//implementation libs.androidx.slice.builders
|
||||
implementation libs.androidx.graphics.shapes
|
||||
implementation libs.androidx.window
|
||||
implementation libs.androidx.core.animation
|
||||
|
||||
@@ -51,7 +51,7 @@ import android.view.View;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.WorkerThread;
|
||||
import androidx.slice.SliceItem;
|
||||
//import androidx.slice.SliceItem;
|
||||
|
||||
import com.android.internal.jank.Cuj;
|
||||
import com.android.launcher3.LauncherAppState;
|
||||
@@ -233,7 +233,7 @@ public class StatsLogCompatManager extends StatsLogManager {
|
||||
private Optional<FromState> mFromState = Optional.empty();
|
||||
private Optional<ToState> mToState = Optional.empty();
|
||||
private Optional<String> mEditText = Optional.empty();
|
||||
private SliceItem mSliceItem;
|
||||
//private SliceItem mSliceItem;
|
||||
private LauncherAtom.Slice mSlice;
|
||||
private Optional<Integer> mCardinality = Optional.empty();
|
||||
private int mInputType = SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__UNKNOWN;
|
||||
@@ -310,18 +310,18 @@ public class StatsLogCompatManager extends StatsLogManager {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
/*@Override
|
||||
public StatsLogger withSliceItem(@NonNull SliceItem sliceItem) {
|
||||
checkState(mItemInfo == DEFAULT_ITEM_INFO && mSlice == null,
|
||||
"ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one"
|
||||
+ " of them.");
|
||||
this.mSliceItem = checkNotNull(sliceItem, "expected valid sliceItem but received null");
|
||||
return this;
|
||||
}
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public StatsLogger withSlice(LauncherAtom.Slice slice) {
|
||||
checkState(mItemInfo == DEFAULT_ITEM_INFO && mSliceItem == null,
|
||||
checkState(mItemInfo == DEFAULT_ITEM_INFO /*&& mSliceItem == null*/,
|
||||
"ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one"
|
||||
+ " of them.");
|
||||
checkNotNull(slice, "expected valid slice but received null");
|
||||
@@ -362,10 +362,10 @@ public class StatsLogCompatManager extends StatsLogManager {
|
||||
Log.d(TAG, name);
|
||||
}
|
||||
|
||||
if (mSlice == null && mSliceItem != null) {
|
||||
/*if (mSlice == null && mSliceItem != null) {
|
||||
mSlice = LauncherAtom.Slice.newBuilder().setUri(
|
||||
mSliceItem.getSlice().getUri().toString()).build();
|
||||
}
|
||||
}*/
|
||||
|
||||
if (mSlice != null) {
|
||||
Executors.MODEL_EXECUTOR.execute(
|
||||
|
||||
@@ -25,7 +25,7 @@ import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.slice.SliceItem;
|
||||
//import androidx.slice.SliceItem;
|
||||
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.logger.LauncherAtom;
|
||||
@@ -1042,12 +1042,12 @@ public class StatsLogManager implements ResourceBasedOverride {
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Sets logging fields from provided {@link SliceItem}.
|
||||
*/
|
||||
default StatsLogger withSliceItem(SliceItem sliceItem) {
|
||||
/*default StatsLogger withSliceItem(SliceItem sliceItem) {
|
||||
return this;
|
||||
}
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Sets logging fields from provided {@link LauncherAtom.Slice}.
|
||||
|
||||
Reference in new issue
Block a user