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

Commit 2037f39b authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

parents a4f2389c d1a098ea

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

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 
        MainPanel panel = new MainPanel();

        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

        transaction.replace(R.id.main_panel_container, panel, MainPanel.FRAGMENT_TAG);

        transaction.commit();

        transaction.commitAllowingStateLoss();

    }



    public void loadEditorPanel(FilterRepresentation representation,

src/com/android/gallery3d/filtershow/category/MainPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class MainPanel extends Fragment { 
            transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left);

        }

        transaction.replace(R.id.category_panel_container, category, CategoryPanel.FRAGMENT_TAG);

        transaction.commit();

        transaction.commitAllowingStateLoss();

    }



    public void loadCategoryLookPanel(boolean force) {