Merge "Implement Settings UI for Screen zoom preference" (5d2e64a2) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_add_24dp.xml

+7 −6

Original line number	Diff line number	Diff line
		@@ -14,11 +14,12 @@
		~ limitations under the License
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="48.0"
		android:viewportHeight="48.0">
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:tint="?android:attr/colorAccent">
		<path
		android:fillColor="?android:attr/colorAccent"
		android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z"/>
		android:fillColor="@android:color/white"
		android:pathData="M38,26L26,26l0,12l-4,0L22,26L10,26l0,-4l12,0L22,10l4,0l0,12l12,0l0,4.0z"/>
		</vector>

res/drawable/ic_info.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>
		android:fillColor="@android:color/white"
		android:pathData="M11,17l2,0l0,-6l-2,0l0,6.0zm1,-15.0C6.48,2 2,6.48 2,12.0s4.48,10 10,10 10,-4.48 10,-10.0S17.52,2 12,2.0zm0,18.0c-4.41,0 -8,-3.59 -8,-8.0s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8.0zM11,9l2,0L13,7l-2,0l0,2.0z"/>
		</vector>

res/drawable/ic_remove_24dp.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:tint="?android:attr/colorAccent">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M38 26H10v-4h28v4z"/>
		</vector>

res/drawable/screen_zoom_preview_action_background.xml

0 → 100644

+22 −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.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="oval">
		<size android:width="24dp"
		android:height="24dp" />
		<solid android:color="@android:color/white" />
		</shape>

res/layout/screen_zoom_activity.xml

0 → 100644

+96 −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.
		-->

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

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:paddingLeft="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/screen_zoom_summary"
		android:layout_marginBottom="16dp"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="@dimen/screen_zoom_preview_height"
		android:background="?android:attr/colorBackgroundFloating"
		android:elevation="2dp">

		<com.android.settings.display.TouchBlockingFrameLayout
		android:id="@+id/preview_frame"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		<TextView
		android:id="@+id/current_density"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|bottom"
		android:padding="8dp"
		android:theme="@android:style/Theme.Material"
		android:background="?android:attr/colorBackgroundFloating"
		android:textAppearance="@android:style/TextAppearance.Material.Caption"
		android:textAllCaps="true"
		android:elevation="2dp" />
		</FrameLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="8dp">

		<ImageView
		android:id="@+id/smaller"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:background="?android:attr/selectableItemBackgroundBorderless"
		android:src="@drawable/ic_remove_24dp"
		android:tint="?android:attr/colorControlNormal"
		android:tintMode="src_in"
		android:scaleType="center"
		android:focusable="true"
		android:contentDescription="@string/screen_zoom_make_smaller_desc" />

		<SeekBar
		android:id="@+id/seek_bar"
		android:layout_width="0dp"
		android:layout_height="48dp"
		android:layout_weight="1" />

		<ImageView
		android:id="@+id/larger"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:background="?android:attr/selectableItemBackgroundBorderless"
		android:src="@drawable/ic_add_24dp"
		android:tint="?android:attr/colorControlNormal"
		android:tintMode="src_in"
		android:scaleType="center"
		android:focusable="true"
		android:contentDescription="@string/screen_zoom_make_larger_desc" />
		</LinearLayout>
		</LinearLayout>
		</ScrollView>