diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
index 272b3b6..795348a 100644
--- a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
+++ b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
@@ -37,7 +37,6 @@ protected void onCreate(Bundle savedInstanceState) {
String vault = extras.getString(Config.vault_extra);
String password = extras.getString(Config.password_extra);
- overridePendingTransition(R.anim.slide_in_right, R.anim.fadeout);
fragmentManager = getFragmentManager();
if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) {
FilesListFragment fragment = new FilesListFragment();
@@ -91,7 +90,6 @@ void switchFragment(final Fragment fragment) {
@Override
public void onPause() {
- overridePendingTransition(R.anim.fadein, R.anim.slide_out_right);
super.onPause();
if (isChangingConfigurations())
onPauseDecision.startActivity();
diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
index 83c1f21..d57b0ba 100644
--- a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
+++ b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
@@ -102,7 +102,7 @@ public void onCreate(Bundle savedInstanceState) {
}
if (pInfo != null) {
if (pInfo.versionCode != versionNumber)
- addFragment(new UpdateManager(), R.anim.slide_in_right, R.anim.fadeout);
+ addFragment(new UpdateManager(), android.R.animator.fade_in, android.R.animator.fade_out);
}
mNavigation.addNavigationItem(
CustomApp.context.getString(R.string.Page_header__vaults),
@@ -284,7 +284,7 @@ public void onFinish(Fragment fragment) {
@Override
public void onNew(Bundle bundle, Fragment fragment) {
fragment.setArguments(bundle);
- addFragment(fragment, R.anim.slide_in_right, R.anim.fadeout);
+ addFragment(fragment, android.R.animator.fade_in, android.R.animator.fade_out);
}
@Override
diff --git a/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java b/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java
index d67f160..27908cf 100644
--- a/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java
+++ b/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java
@@ -243,7 +243,6 @@ public void onBindViewHolder(final ViewHolder viewHolder, int position) {
int viewIndex;
if (data.get(position).getIsDecrypting()){
- viewHolder.animator.setInAnimation(context, R.anim.slide_down);
viewIndex = 1;
} else {
viewHolder.animator.setInAnimation(null);
diff --git a/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java b/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java
index ee092d6..2bbf6d9 100644
--- a/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java
+++ b/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java
@@ -466,7 +466,6 @@ public void run() {
EditText passwordView = (EditText) parentView.findViewById(R.id.open_password);
final View renameView = parentView.findViewById(R.id.rename_name);
ViewAnimator viewAnimator = (ViewAnimator) parentView.findViewById(R.id.viewAnimator);
- viewAnimator.setInAnimation(context, R.anim.slide_down);
int viewIndex = 0;
switch (showView) {
diff --git a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
index 542c1c1..24915f8 100644
--- a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
+++ b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
@@ -238,7 +238,6 @@ public void run() {
}
FilesListAdapter.ViewHolder holder = (FilesListAdapter.ViewHolder) frame.getTag();
ViewAnimator viewAnimator = holder.animator;
- viewAnimator.setInAnimation(context, R.anim.slide_down);
int viewIndex = 0;
switch (showView) {
case R.id.dataLayout:
diff --git a/app/src/main/res/anim/fadein.xml b/app/src/main/res/anim/fadein.xml
deleted file mode 100644
index 38e73ae..0000000
--- a/app/src/main/res/anim/fadein.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/fadeout.xml b/app/src/main/res/anim/fadeout.xml
deleted file mode 100644
index a002af4..0000000
--- a/app/src/main/res/anim/fadeout.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml
deleted file mode 100644
index 73c445c..0000000
--- a/app/src/main/res/anim/slide_down.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
deleted file mode 100644
index 65fc033..0000000
--- a/app/src/main/res/anim/slide_in_right.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
deleted file mode 100644
index 47c7ad4..0000000
--- a/app/src/main/res/anim/slide_out_right.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file