github-mirror/Murine-launcher
1
0 Fork 0
mirror of https://github.com/alesimula/Murine-launcher.git synced 2026-10-28 09:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD - removed androidx.slice dependency

Browse Source
This commit is contained in:
Alex Sim committed 2026-09-20 16:16:07 +02:00
1 parent a0f8c7694a
commit 328051b177
3 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle
+1 -1
View File
@@ -317,7 +317,7 @@ dependencies {
implementation libs.androidx.recyclerview implementation libs.androidx.recyclerview
implementation libs.androidx.dynamicanimation implementation libs.androidx.dynamicanimation
implementation libs.androidx.preference implementation libs.androidx.preference
implementation libs.androidx.slice.builders //implementation libs.androidx.slice.builders
implementation libs.androidx.graphics.shapes implementation libs.androidx.graphics.shapes
implementation libs.androidx.window implementation libs.androidx.window
implementation libs.androidx.core.animation implementation libs.androidx.core.animation
quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+7 -7
View File
@@ -51,7 +51,7 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;
import androidx.slice.SliceItem; //import androidx.slice.SliceItem;
import com.android.internal.jank.Cuj; import com.android.internal.jank.Cuj;
import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherAppState;
@@ -233,7 +233,7 @@ public class StatsLogCompatManager extends StatsLogManager {
private Optional<FromState> mFromState = Optional.empty(); private Optional<FromState> mFromState = Optional.empty();
private Optional<ToState> mToState = Optional.empty(); private Optional<ToState> mToState = Optional.empty();
private Optional<String> mEditText = Optional.empty(); private Optional<String> mEditText = Optional.empty();
private SliceItem mSliceItem; //private SliceItem mSliceItem;
private LauncherAtom.Slice mSlice; private LauncherAtom.Slice mSlice;
private Optional<Integer> mCardinality = Optional.empty(); private Optional<Integer> mCardinality = Optional.empty();
private int mInputType = SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__UNKNOWN; private int mInputType = SysUiStatsLog.LAUNCHER_UICHANGED__INPUT_TYPE__UNKNOWN;
@@ -310,18 +310,18 @@ public class StatsLogCompatManager extends StatsLogManager {
return this; return this;
} }
@Override /*@Override
public StatsLogger withSliceItem(@NonNull SliceItem sliceItem) { public StatsLogger withSliceItem(@NonNull SliceItem sliceItem) {
checkState(mItemInfo == DEFAULT_ITEM_INFO && mSlice == null, checkState(mItemInfo == DEFAULT_ITEM_INFO && mSlice == null,
"ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one" "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one"
+ " of them."); + " of them.");
this.mSliceItem = checkNotNull(sliceItem, "expected valid sliceItem but received null"); this.mSliceItem = checkNotNull(sliceItem, "expected valid sliceItem but received null");
return this; return this;
} }*/
@Override @Override
public StatsLogger withSlice(LauncherAtom.Slice slice) { 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" "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one"
+ " of them."); + " of them.");
checkNotNull(slice, "expected valid slice but received null"); checkNotNull(slice, "expected valid slice but received null");
@@ -362,10 +362,10 @@ public class StatsLogCompatManager extends StatsLogManager {
Log.d(TAG, name); Log.d(TAG, name);
} }
if (mSlice == null && mSliceItem != null) { /*if (mSlice == null && mSliceItem != null) {
mSlice = LauncherAtom.Slice.newBuilder().setUri( mSlice = LauncherAtom.Slice.newBuilder().setUri(
mSliceItem.getSlice().getUri().toString()).build(); mSliceItem.getSlice().getUri().toString()).build();
} }*/
if (mSlice != null) { if (mSlice != null) {
Executors.MODEL_EXECUTOR.execute( Executors.MODEL_EXECUTOR.execute(
src/com/android/launcher3/logging/StatsLogManager.java
+4 -4
View File
@@ -25,7 +25,7 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.slice.SliceItem; //import androidx.slice.SliceItem;
import com.android.launcher3.R; import com.android.launcher3.R;
import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logger.LauncherAtom;
@@ -1042,12 +1042,12 @@ public class StatsLogManager implements ResourceBasedOverride {
return this; return this;
} }
/** /*
* Sets logging fields from provided {@link SliceItem}. * Sets logging fields from provided {@link SliceItem}.
*/ */
default StatsLogger withSliceItem(SliceItem sliceItem) { /*default StatsLogger withSliceItem(SliceItem sliceItem) {
return this; return this;
} }*/
/** /**
* Sets logging fields from provided {@link LauncherAtom.Slice}. * Sets logging fields from provided {@link LauncherAtom.Slice}.