PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev

Browse Source
This commit is contained in:
Anna Galusza
2016-03-30 21:39:05 +00:00
committed by Android (Google) Code Review
parent 8df04151d0 062efd0f17
commit d2a686fbc2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/PreviewPagerAdapter.java
View File

@@ -47,6 +47,10 @@ public class PreviewPagerAdapter extends PagerAdapter {
Configuration[] configurations) { Configuration[] configurations) {
mPreviewFrames = new TouchBlockingFrameLayout[previewSampleResIds.length]; 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) { for (int i = 0; i < previewSampleResIds.length; ++i) {
mPreviewFrames[i] = (TouchBlockingFrameLayout) LayoutInflater.from(context) mPreviewFrames[i] = (TouchBlockingFrameLayout) LayoutInflater.from(context)
.inflate(R.layout.preview_frame_container, null); .inflate(R.layout.preview_frame_container, null);
@@ -69,6 +73,10 @@ public class PreviewPagerAdapter extends PagerAdapter {
mPreviewFrames[i].addView(sampleView); 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 @Override