diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java')
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java index abadb0be..ebde85c6 100644..100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java @@ -11,6 +11,8 @@ import android.os.Bundle; import android.os.Handler; import android.os.Parcelable; import android.preference.PreferenceManager; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.widget.DrawerLayout; @@ -466,8 +468,19 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("searchQuery", hf.getSearchQuery()); //intent.putParcelableArrayListExtra("articles", hf.getArticles()); intent.putExtra("articles", (Parcelable)hf.getAllArticles()); - - startActivityForResult(intent, HEADLINES_REQUEST); + + /* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + startActivityForResult(intent, HEADLINES_REQUEST, ActivityOptions.makeSceneTransitionAnimation(this).toBundle()); + } else { + startActivityForResult(intent, HEADLINES_REQUEST); + } */ + + View sharedList = hf.getView().findViewById(R.id.headlines_list); + + ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST"); + + ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle()); + } else { invalidateOptionsMenu(); } |