summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 9508bdc21..d589bef0b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -160,6 +160,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
}
private ServiceConnection mConnection = new ServiceConnection() {
+ @Override
public void onServiceConnected(ComponentName className, IBinder service) {
/*
* This is called when the connection with the service has been
@@ -173,6 +174,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
mBoundService.onStart();
}
+ @Override
public void onServiceDisconnected(ComponentName className) {
/*
* This is called when the connection with the service has been
@@ -598,6 +600,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
if (!result) {
cannotLoadImage();
+ // TODO: We should figure out the best way preventing this from
+ // happening, e.g: early checking.
+ return;
}
if (null == CachingPipeline.getRenderScriptContext()){
@@ -669,7 +674,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
private int getScreenImageSize() {
DisplayMetrics outMetrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
- return (int) Math.max(outMetrics.heightPixels, outMetrics.widthPixels);
+ return Math.max(outMetrics.heightPixels, outMetrics.widthPixels);
}
private void showSavingProgress(String albumName) {