summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-02-12 14:48:57 +0300
committerAndrew Dolgov <[email protected]>2015-02-12 14:48:57 +0300
commita7e86f29de59710c8d4949fe72c28ef15fbdd1d9 (patch)
treea7a661cf25265adf04fe52f994e8fc2bc5f21d32 /org.fox.ttrss/src/main/java
parent9ac66287a29cb5dd68d4adc49c74535e7b70ea67 (diff)
card layout updates
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java11
1 files changed, 8 insertions, 3 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 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();