summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-02-14 22:17:36 +0300
committerAndrew Dolgov <[email protected]>2015-02-14 22:17:36 +0300
commit4aeac28cb4fc22a3176a485056df1c22ef649261 (patch)
treed2ee29c3d8da126dbcabf8daa6a2e08c3852fb49 /org.fox.ttrss
parent8f4b9187f6f8960864a0631a06d80b584cf95690 (diff)
disable headlines transition altogether re: instability
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java14
2 files changed, 3 insertions, 13 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 9ebd56bc..fd97f34c 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="313"
+ android:versionCode="314"
android:versionName="1.90" >
<uses-sdk
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 bff85901..5a29888c 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
@@ -10,8 +10,6 @@ import android.content.SharedPreferences;
import android.os.Bundle;
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;
@@ -454,16 +452,8 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
startActivityForResult(intent, HEADLINES_REQUEST);
} */
- if (!isPortrait() && !isSmallScreen()) {
- 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 {
- // mysterious crashes if we use activitycompat here so welp
- startActivityForResult(intent, HEADLINES_REQUEST);
- }
+ // mysterious crashes somewhere in gl layer (?) on some feeds if we use activitycompat transitions here on LP so welp
+ startActivityForResult(intent, HEADLINES_REQUEST);
} else {