diff options
| -rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/activity_preferences.xml | 3 |
3 files changed, 4 insertions, 13 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index ffd0a4ba..9a62d97e 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="478" - android:versionName="1.244"> + android:versionCode="479" + android:versionName="1.245"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index ec4e4a7a..e4eaa432 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -54,10 +54,7 @@ public abstract class BaseFeedlistFragment extends StateSavedFragment { Intent intent = new Intent(getActivity(), PreferencesActivity.class); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(getActivity(), v, "SETTINGS_REVEAL"); - - ActivityCompat.startActivityForResult(getActivity(), intent, 0, options.toBundle()); + startActivityForResult(intent, 0); } catch (Exception e) { e.printStackTrace(); @@ -121,10 +118,7 @@ public abstract class BaseFeedlistFragment extends StateSavedFragment { Intent intent = new Intent(getActivity(), PreferencesActivity.class); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(getActivity(), v, "SETTINGS_REVEAL"); - - ActivityCompat.startActivityForResult(getActivity(), intent, 0, options.toBundle()); + startActivityForResult(intent, 0); } catch (Exception e) { e.printStackTrace(); diff --git a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml index bd37a3ce..519bfe61 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:transitionName="SETTINGS_REVEAL" - android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent"> <FrameLayout android:id="@+id/preferences_container" android:background="?android:colorBackground" - android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" |