Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." (62f75238) · Commits · e / os / android_packages_apps_Settings

res/drawable/preview_seek_bar_outline.xml

0 → 100644

+22 −0

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.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle" >
		<stroke
		android:width="8dp"
		android:color="@color/seek_bar_preference_preview_border_tint" />
		</shape>

res/layout/font_size_activity.xml

+65 −65

Original line number	Diff line number	Diff line
		@@ -19,6 +19,13 @@
		android:layout_height="match_parent"
		android:fillViewport="true">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" >

		<include layout="@layout/preview_seek_bar_view_pager" />

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		@@ -27,14 +34,6 @@
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<android.support.v4.view.ViewPager
		android:id="@+id/preview_pager"
		android:layout_width="match_parent"
		android:layout_height="@dimen/font_size_preview_height"
		android:layout_weight="1"
		android:background="?android:attr/colorBackgroundFloating"
		android:elevation="2dp" />

		<com.android.settings.widget.DotsPageIndicator
		android:id="@+id/page_indicator"
		style="@style/PreviewPagerPageIndicator"
		@@ -97,4 +96,5 @@
		android:layout_marginBottom="16dp"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
		</LinearLayout>
		</LinearLayout>
		</ScrollView>

res/layout/font_size_preview.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_margin="16dp"
		android:orientation="vertical">

		<TextView

res/layout/preview_seek_bar_view_pager.xml

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2015 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.
		-->

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:foreground="@drawable/preview_seek_bar_outline" >

		<android.support.v4.view.ViewPager
		android:id="@+id/preview_pager"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="?android:attr/colorBackgroundFloating" />

		<View
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:layout_alignParentTop="false"
		android:layout_alignParentBottom="true"
		android:layout_margin="8dp"
		android:background="@color/seek_bar_preference_preview_border_tint" />

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="?android:attr/actionBarSize"
		android:layout_marginStart="32dp"
		android:layout_alignParentStart="true"
		android:layout_alignParentTop="false"
		android:layout_alignParentBottom="true"
		android:gravity="center"
		android:text="@string/screen_zoom_preview_title"
		android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
		android:textColor="@color/seek_bar_preference_preview_text"
		android:elevation="2dp"/>
		</RelativeLayout>

res/layout/screen_zoom_activity.xml

+64 −64

Original line number	Diff line number	Diff line
		@@ -19,6 +19,13 @@
		android:layout_height="match_parent"
		android:fillViewport="true">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" >

		<include layout="@layout/preview_seek_bar_view_pager" />

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		@@ -27,14 +34,6 @@
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<android.support.v4.view.ViewPager
		android:id="@+id/preview_pager"
		android:layout_width="match_parent"
		android:layout_height="@dimen/screen_zoom_preview_height"
		android:layout_weight="1"
		android:background="?android:attr/colorBackgroundFloating"
		android:elevation="2dp" />

		<com.android.settings.widget.DotsPageIndicator
		android:id="@+id/page_indicator"
		style="@style/PreviewPagerPageIndicator"
		@@ -96,4 +95,5 @@
		android:layout_marginBottom="16dp"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
		</LinearLayout>
		</LinearLayout>
		</ScrollView>