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

Commit d2a686fb authored by Anna Galusza's avatar Anna Galusza Committed by Android (Google) Code Review
Browse files

Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:...

Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev
parents 8df04151 062efd0f
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ public class PreviewPagerAdapter extends PagerAdapter {
                               Configuration[] configurations) {
        mPreviewFrames = new TouchBlockingFrameLayout[previewSampleResIds.length];

        // We need to get the copy of the original configuration before we call
        // createConfigurationContext() as that call changes the current configuration for the App.
        final Configuration origConfig = context.getResources().getConfiguration();

        for (int i = 0; i < previewSampleResIds.length; ++i) {
            mPreviewFrames[i] = (TouchBlockingFrameLayout) LayoutInflater.from(context)
                    .inflate(R.layout.preview_frame_container, null);
@@ -69,6 +73,10 @@ public class PreviewPagerAdapter extends PagerAdapter {
                mPreviewFrames[i].addView(sampleView);
            }
        }

        // Create a context with the original App configuration since the last configuration passed
        // to createConfigurationContext() becomes the configuration for any new views inflated.
        context.createConfigurationContext(origConfig);
    }

    @Override