Merge "CMFM: Fix FC caused by accessing ui outside of UI thread" into cm-10.1 (883a1546) · Commits · e / os / android_packages_apps_CMFileManager

src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java

+14 −8

Original line number	Diff line number	Diff line
		@@ -906,7 +906,11 @@ public class NavigationView extends RelativeLayout implements
		*
		* @param out Fade out (true); Fade in (false)
		*/
		void fadeEfect(boolean out) {
		void fadeEfect(final boolean out) {
		Activity activity = (Activity)getContext();
		activity.runOnUiThread(new Runnable() {
		@Override
		public void run() {
		Animation fadeAnim = out ?
		new AlphaAnimation(1, 0) :
		new AlphaAnimation(0, 1);
		@@ -915,6 +919,8 @@ public class NavigationView extends RelativeLayout implements
		fadeAnim.setInterpolator(new AccelerateInterpolator());
		NavigationView.this.startAnimation(fadeAnim);
		}
		});
		}
		};
		task.execute(fNewDir);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@ public final class ExceptionUtil {
		Object result = CommandHelper.reexecute(
		context, executable, null);
		if (relaunchable.getTask() != null) {
		relaunchable.getTask().cancel(true);
		relaunchable.getTask().execute(result);
		}
		}