Merge "Make preview screens in font/display size settings scrollable Bug:... (74df3ec0) · Commits · e / os / android_packages_apps_Settings

res/layout/font_size_preview.xml

+40 −28

Original line number	Diff line number	Diff line
		@@ -14,7 +14,17 @@
		limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fillViewport="true" >

		<view class="com.android.settings.TouchBlockingFrameLayout"
		android:id="@+id/frame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingTop="16dp"
		@@ -46,3 +56,5 @@
		android:text="@string/font_size_preview_text_body"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"/>
		</LinearLayout>
		</view>
		</ScrollView>

res/layout/preview_frame_container.xml

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<view xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.settings.TouchBlockingFrameLayout"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

res/layout/screen_zoom_preview_1.xml

+54 −44

Original line number	Diff line number	Diff line
		@@ -13,9 +13,18 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fillViewport="true" >

		<view class="com.android.settings.TouchBlockingFrameLayout"
		android:id="@+id/frame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/conversation_background"
		@@ -64,5 +73,6 @@
		app:iconText="@string/screen_zoom_conversation_icon_pete"
		app:iconTextColor="@color/message_icon_text_incoming"
		app:iconBackgroundColor="@color/message_icon_background_incoming" />

		</LinearLayout>
		</view>
		</ScrollView>

res/layout/screen_zoom_preview_settings.xml

+172 −166

Original line number	Diff line number	Diff line
		@@ -17,10 +17,15 @@
		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scrollbars="none"
		android:fillViewport="true"
		android:background="?android:attr/colorBackgroundFloating"
		android:importantForAccessibility="noHideDescendants">

		<view class="com.android.settings.TouchBlockingFrameLayout"
		android:id="@+id/frame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -217,4 +222,5 @@
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		</view>
		</ScrollView>

src/com/android/settings/PreviewPagerAdapter.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import android.view.animation.AccelerateInterpolator;
		import android.view.animation.DecelerateInterpolator;
		import android.view.animation.Interpolator;
		import android.widget.FrameLayout;
		import android.widget.LinearLayout;
		import android.widget.ScrollView;

		/**
		* A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen
		@@ -32,7 +34,7 @@ import android.widget.FrameLayout;
		*/
		public class PreviewPagerAdapter extends PagerAdapter {

		private TouchBlockingFrameLayout[] mPreviewFrames;
		private FrameLayout[] mPreviewFrames;

		/** Duration to use when cross-fading between previews. */
		private static final long CROSS_FADE_DURATION_MS = 400;
		@@ -45,15 +47,17 @@ public class PreviewPagerAdapter extends PagerAdapter {

		public PreviewPagerAdapter(Context context, int[] previewSampleResIds,
		Configuration[] configurations) {
		mPreviewFrames = new TouchBlockingFrameLayout[previewSampleResIds.length];
		mPreviewFrames = new FrameLayout[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);
		mPreviewFrames[i] = new FrameLayout(context);
		mPreviewFrames[i].setLayoutParams(new LinearLayout.LayoutParams(
		LinearLayout.LayoutParams.MATCH_PARENT,
		LinearLayout.LayoutParams.MATCH_PARENT));
		mPreviewFrames[i].setContentDescription(
		context.getString(R.string.preview_page_indicator_content_description, i + 1,
		previewSampleResIds.length));
		@@ -69,7 +73,6 @@ public class PreviewPagerAdapter extends PagerAdapter {
		mPreviewFrames[i], false);
		sampleView.setAlpha(0);
		sampleView.setVisibility(View.INVISIBLE);

		mPreviewFrames[i].addView(sampleView);
		}
		}