From a7e86f29de59710c8d4949fe72c28ef15fbdd1d9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 12 Feb 2015 14:48:57 +0300 Subject: card layout updates --- org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') 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 9f7583e9..56ecafdd 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 @@ -459,11 +459,16 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe startActivityForResult(intent, HEADLINES_REQUEST); } */ - View sharedList = hf.getView().findViewById(R.id.headlines_list); + if (!isPortrait() && !isSmallScreen()) { + View sharedList = hf.getView().findViewById(R.id.headlines_list); - ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST"); + ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST"); - ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle()); + ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle()); + } else { + ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this); + ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle()); + } } else { invalidateOptionsMenu(); -- cgit v1.2.3-54-g00ecf