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

Commit 75386abc authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Fix git merge issues

parent 790790c6
Loading
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ import foundation.e.blisslauncher.features.weather.WeatherUtils;
import foundation.e.blisslauncher.features.widgets.WidgetManager;
import foundation.e.blisslauncher.features.widgets.WidgetViewBuilder;
import foundation.e.blisslauncher.features.widgets.WidgetsActivity;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -145,12 +144,9 @@ import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.observers.DisposableObserver;
import io.reactivex.schedulers.Schedulers;
import me.relex.circleindicator.CircleIndicator;
<<<<<<< HEAD

import static android.view.View.GONE;
import static android.view.View.VISIBLE;
=======
>>>>>>> Fix build error because of wrong dependencies

public class LauncherActivity extends AppCompatActivity implements
        AutoCompleteAdapter.OnSuggestionClickListener, OnSwipeDownListener {
@@ -360,13 +356,6 @@ public class LauncherActivity extends AppCompatActivity implements
        managedProfileReceiver = ManagedProfileBroadcastReceiver.register(this);
    }

<<<<<<< HEAD
    protected void attachBaseContext(Context context) {
        super.attachBaseContext(ViewPumpContextWrapper.wrap(context));
    }

=======
>>>>>>> Fix build error because of wrong dependencies
    public CompositeDisposable getCompositeDisposable() {
        if (mCompositeDisposable == null || mCompositeDisposable.isDisposed()) {
            mCompositeDisposable = new CompositeDisposable();