summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java3
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java2
5 files changed, 1 insertions, 10 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 42f9d912..ebd14bc9 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
@@ -453,8 +453,6 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
intent.putExtra("articles", (Parcelable)hf.getAllArticles());
startActivityForResult(intent, HEADLINES_REQUEST);
- overridePendingTransition(R.anim.right_slide_in, 0);
-
} else {
invalidateOptionsMenu();
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
index 6a25db7f..226ba5d1 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
@@ -163,7 +163,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
setResult(Activity.RESULT_OK, resultIntent);
finish();
- overridePendingTransition(0, R.anim.right_slide_out);
return true;
default:
Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
@@ -321,7 +320,5 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
setResult(Activity.RESULT_OK, resultIntent);
super.onBackPressed();
-
- overridePendingTransition(0, R.anim.right_slide_out);
}
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index dddefa6d..a508f9aa 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -468,7 +468,7 @@ public class OnlineActivity extends CommonActivity {
startActivityForResult(intent, 0);
overridePendingTransition(0, 0);
-
+
if (hasPendingOfflineData())
syncOfflineData();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java
index 83b0843f..f390b890 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java
@@ -335,8 +335,6 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
startActivityForResult(intent, 0);
- overridePendingTransition(R.anim.right_slide_in, 0);
-
} else {
refresh();
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
index ed8ee518..f187f87e 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
@@ -132,7 +132,6 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline
switch (item.getItemId()) {
case android.R.id.home:
finish();
- overridePendingTransition(0, R.anim.right_slide_out);
return true;
default:
Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
@@ -201,6 +200,5 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline
@Override
public void onBackPressed() {
super.onBackPressed();
- overridePendingTransition(0, R.anim.right_slide_out);
}
}