Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dcaeec6 authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches 

* commit '8b3ce9b0':
  Fix crash when showing history
parents 45dfd43e 8b3ce9b0

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -457,6 +457,9 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
        int accessoryPanelWidth = viewPanel.getWidth();

        int mainViewWidth = findViewById(R.id.mainView).getWidth();

        int mainPanelWidth = mImageShow.getDisplayedImageBounds().width();

        if (mainPanelWidth == 0) {

            mainPanelWidth = mainViewWidth;

        }

        int leftOver = mainViewWidth - mainPanelWidth - accessoryPanelWidth;

        if (leftOver < 0) {

            return -accessoryPanelWidth;

src/com/android/gallery3d/filtershow/imageshow/ImageShow.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class ImageShow extends View implements OnGestureListener, 
    private HistoryAdapter mHistoryAdapter = null;

    private ImageStateAdapter mImageStateAdapter = null;



    private Rect mImageBounds = null;

    private Rect mImageBounds = new Rect();



    private boolean mTouchShowOriginal = false;

    private long mTouchShowOriginalDate = 0;