Loading app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java +0 −11 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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 { Loading Loading @@ -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(); Loading Loading
app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java +0 −11 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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 { Loading Loading @@ -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(); Loading