diff --git a/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java index de3444b..498598d 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.Toolbar; import android.view.Menu; @@ -127,7 +126,7 @@ public class MainActivity extends BaseActivity implements Navigation.Callback { return true; } else if (item.getItemId() == R.id.action_search) { Intent intent = new Intent(this, SearchActivity.class); - startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(this).toBundle()); + startActivity(intent); } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java index 91d9ae1..2a62709 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java @@ -3,19 +3,12 @@ package org.houxg.leamonax.ui; import android.app.AlertDialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.view.GravityCompat; import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SearchView; import android.support.v7.widget.Toolbar; import android.text.TextUtils; -import android.transition.Slide; -import android.transition.Transition; -import android.transition.TransitionInflater; -import android.view.Gravity; -import android.view.View; -import android.view.Window; import android.widget.ImageView; import org.houxg.leamonax.R; @@ -24,14 +17,11 @@ import org.houxg.leamonax.model.Note; import org.houxg.leamonax.service.NoteService; import org.houxg.leamonax.utils.ActionModeHandler; import org.houxg.leamonax.utils.CollectionUtils; -import org.houxg.leamonax.utils.DisplayUtils; import org.houxg.leamonax.utils.ToastUtils; -import org.houxg.leamonax.widget.DividerDecoration; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; @@ -59,9 +49,6 @@ public class SearchActivity extends BaseActivity implements NoteAdapter.NoteAdap @Override protected void onCreate(Bundle savedInstanceState) { - getWindow().requestFeature(Window.FEATURE_CONTENT_TRANSITIONS); - getWindow().setEnterTransition(new Slide(Gravity.END)); - getWindow().setReturnTransition(new Slide(Gravity.END)); super.onCreate(savedInstanceState); setContentView(R.layout.activity_search); ButterKnife.bind(this);