diff --git a/res/layout-h360dp/font_size_activity.xml b/res/layout-h360dp/font_size_activity.xml new file mode 100644 index 00000000000..aa3930cbdcd --- /dev/null +++ b/res/layout-h360dp/font_size_activity.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout-h360dp/screen_zoom_activity.xml b/res/layout-h360dp/screen_zoom_activity.xml new file mode 100644 index 00000000000..0141019f591 --- /dev/null +++ b/res/layout-h360dp/screen_zoom_activity.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/font_size_activity.xml b/res/layout/font_size_activity.xml index aa3930cbdcd..4825f24c937 100644 --- a/res/layout/font_size_activity.xml +++ b/res/layout/font_size_activity.xml @@ -22,79 +22,63 @@ + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> - + + android:gravity="center_vertical" + android:paddingTop="8dp"> - + - + - - - - - - - - - - + + + diff --git a/res/layout/screen_zoom_activity.xml b/res/layout/screen_zoom_activity.xml index 0141019f591..36dd9fa0c47 100644 --- a/res/layout/screen_zoom_activity.xml +++ b/res/layout/screen_zoom_activity.xml @@ -22,78 +22,62 @@ + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> - + + android:gravity="center_vertical"> - + - + - - - - - - - - - - + + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9d739c0171f..0ddb5d836a3 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -295,7 +295,7 @@ 8dp - 200dp + 240dp 16dp diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java index aa663cf349c..a7763f71062 100644 --- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java +++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java @@ -151,51 +151,21 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc configurations[i] = createConfig(origConfig, i); } - mPreviewPagerAdapter = new PreviewPagerAdapter(context, mPreviewSampleResIds, - configurations); mPreviewPager = (ViewPager) content.findViewById(R.id.preview_pager); - mPreviewPager.setAdapter(mPreviewPagerAdapter); - mPreviewPager.addOnPageChangeListener(new OnPageChangeListener() { - @Override - public void onPageScrollStateChanged(int state) { - // Do nothing. + if (mPreviewPager != null) { + mPreviewPagerAdapter = new PreviewPagerAdapter(context, mPreviewSampleResIds, + configurations); + mPreviewPager.setAdapter(mPreviewPagerAdapter); + mPreviewPager.addOnPageChangeListener(mPreviewPageChangeListener); + + mPageIndicator = (DotsPageIndicator) content.findViewById(R.id.page_indicator); + if (mPreviewSampleResIds.length > 1) { + mPageIndicator.setViewPager(mPreviewPager); + mPageIndicator.setVisibility(View.VISIBLE); + mPageIndicator.setOnPageChangeListener(mPageIndicatorPageChangeListener); + } else { + mPageIndicator.setVisibility(View.GONE); } - - @Override - public void onPageScrolled(int position, float positionOffset, - int positionOffsetPixels) { - // Do nothing. - } - - @Override - public void onPageSelected(int position) { - mPreviewPager.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT); - } - }); - - mPageIndicator = (DotsPageIndicator) content.findViewById(R.id.page_indicator); - if (mPreviewSampleResIds.length > 1) { - mPageIndicator.setViewPager(mPreviewPager); - mPageIndicator.setVisibility(View.VISIBLE); - mPageIndicator.setOnPageChangeListener(new OnPageChangeListener() { - @Override - public void onPageScrollStateChanged(int state) { - // Do nothing. - } - - @Override - public void onPageScrolled(int position, float positionOffset, - int positionOffsetPixels) { - // Do nothing. - } - - @Override - public void onPageSelected(int position) { - setPagerIndicatorContentDescription(position); - } - }); - } else { - mPageIndicator.setVisibility(View.GONE); } setPreviewLayer(mInitialIndex, false); @@ -207,15 +177,21 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc */ protected abstract Configuration createConfig(Configuration origConfig, int index); + /** + * Persists the selected value and sends a configuration change. + */ + protected abstract void commit(); + private void setPreviewLayer(int index, boolean animate) { mLabel.setText(mEntries[index]); mSmaller.setEnabled(index > 0); mLarger.setEnabled(index < mEntries.length - 1); + if (mPreviewPager != null) { + setPagerIndicatorContentDescription(mPreviewPager.getCurrentItem()); + mPreviewPagerAdapter.setPreviewLayer(index, mCurrentIndex, + mPreviewPager.getCurrentItem(), animate); + } - setPagerIndicatorContentDescription(mPreviewPager.getCurrentItem()); - - mPreviewPagerAdapter.setPreviewLayer(index, mCurrentIndex, mPreviewPager.getCurrentItem(), - animate); mCurrentIndex = index; } @@ -225,8 +201,39 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc position + 1, mPreviewSampleResIds.length)); } - /** - * Persists the selected value and sends a configuration change. - */ - protected abstract void commit(); + private OnPageChangeListener mPreviewPageChangeListener = new OnPageChangeListener() { + @Override + public void onPageScrollStateChanged(int state) { + // Do nothing. + } + + @Override + public void onPageScrolled(int position, float positionOffset, + int positionOffsetPixels) { + // Do nothing. + } + + @Override + public void onPageSelected(int position) { + mPreviewPager.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT); + } + }; + + private OnPageChangeListener mPageIndicatorPageChangeListener = new OnPageChangeListener() { + @Override + public void onPageScrollStateChanged(int state) { + // Do nothing. + } + + @Override + public void onPageScrolled(int position, float positionOffset, + int positionOffsetPixels) { + // Do nothing. + } + + @Override + public void onPageSelected(int position) { + setPagerIndicatorContentDescription(position); + } + }; }