summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2018-07-10 09:53:40 +0300
committerAndrew Dolgov <[email protected]>2018-07-10 09:53:40 +0300
commit4e8b3e55d68b019043d62da265b384361b616592 (patch)
treec729fff14e8af939f783607e4ac2fb1bdde075b7 /org.fox.ttrss
parent191f3786f18b76e4e2b785332c450e454641d75c (diff)
disable settings reveal animation because it screws with preferencefragment layout somehow preventing preferences from being interactable
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java10
-rwxr-xr-x[-rw-r--r--]org.fox.ttrss/src/main/res/layout/activity_preferences.xml3
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"