diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-01-07 03:26:40 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-07 03:26:40 -0800 |
| commit | b527c896586c772b96021faec2d29d21cda27990 (patch) | |
| tree | 4e73e149b3ee32622a5832e226614ebc78a3be95 /src | |
| parent | fb04a549891fad8d0f46bc2d26ba6bbf160002a3 (diff) | |
| parent | 5a9f961a574475a9a7c43a7f3c5a4c5837e9ded6 (diff) | |
Merge "CMFM: Fix navigation view fade effect" into cm-10.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java index f6e7139..afcf457 100644 --- a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java @@ -63,6 +63,7 @@ import com.cyanogenmod.filemanager.ui.widgets.FlingerListView.OnItemFlingerRespo import com.cyanogenmod.filemanager.util.CommandHelper; import com.cyanogenmod.filemanager.util.DialogHelper; import com.cyanogenmod.filemanager.util.ExceptionUtil; +import com.cyanogenmod.filemanager.util.ExceptionUtil.OnRelaunchCommandResult; import com.cyanogenmod.filemanager.util.FileHelper; import com.cyanogenmod.filemanager.util.StorageHelper; @@ -828,7 +829,7 @@ public class NavigationView extends RelativeLayout implements } } - //Capture exception + //Capture exception (attach task, and use listener to do the anim) ExceptionUtil.attachAsyncTask( ex, new AsyncTask<Object, Integer, Boolean>() { @@ -845,16 +846,31 @@ public class NavigationView extends RelativeLayout implements files, addToHistory, isNewHistory, hasChanged, searchInfo, fNewDir, scrollTo); - - // Do animation - fadeEfect(false); } }); return Boolean.TRUE; } - }); - ExceptionUtil.translateException(getContext(), ex); + final OnRelaunchCommandResult exListener = + new OnRelaunchCommandResult() { + @Override + public void onSuccess() { + // Do animation + fadeEfect(false); + } + @Override + public void onFailed(Throwable cause) { + // Do animation + fadeEfect(false); + } + @Override + public void onCancelled() { + // Do animation + fadeEfect(false); + } + }; + ExceptionUtil.translateException( + getContext(), ex, false, true, exListener); } return null; } |