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

Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev

Browse Source 
am: 335a958b57

* commit '335a958b57045c90baad25f186a0a27f16dfa9bc':
  Change style of Preview screens (dark borders with "preview" on the bottom).
This commit is contained in:
Anna Galusza
2016-02-10 18:07:06 +00:00
committed by android-build-merger
parent 24f6a0eebc 335a958b57
commit bfdee58b89
9 changed files with 217 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/drawable/preview_seek_bar_outline.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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>

130
res/layout/font_size_activity.xml
View File

@@ -22,79 +22,79 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" >
android:paddingTop="16dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<android.support.v4.view.ViewPager <include layout="@layout/preview_seek_bar_view_pager" />
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"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="6dp" />
<TextView
android:id="@+id/current_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"
android:elevation="2dp" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:paddingTop="16dp"
android:paddingTop="8dp"> android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<ImageView <com.android.settings.widget.DotsPageIndicator
android:id="@+id/smaller" android:id="@+id/page_indicator"
android:layout_width="48dp" style="@style/PreviewPagerPageIndicator"
android:layout_height="48dp" android:layout_width="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless" android:layout_height="wrap_content"
android:src="@drawable/ic_font_size_24dp" android:layout_gravity="center_horizontal"
android:tint="?android:attr/colorControlNormal" android:padding="6dp" />
android:tintMode="src_in"
android:scaleType="center"
android:focusable="true"
android:contentDescription="@string/font_size_make_smaller_desc" />
<com.android.settings.widget.LabeledSeekBar <TextView
android:id="@+id/seek_bar" android:id="@+id/current_label"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_gravity="center_horizontal"
style="@android:style/Widget.Material.SeekBar.Discrete"/> android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"
android:elevation="2dp" />
<ImageView <LinearLayout
android:id="@+id/larger" android:layout_width="match_parent"
android:layout_width="48dp" android:layout_height="wrap_content"
android:layout_height="48dp" android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless" android:paddingTop="8dp">
android:src="@drawable/ic_font_size_36dp"
android:tint="?android:attr/colorControlNormal" <ImageView
android:tintMode="src_in" android:id="@+id/smaller"
android:scaleType="center" android:layout_width="48dp"
android:focusable="true" android:layout_height="48dp"
android:contentDescription="@string/font_size_make_larger_desc" /> android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_font_size_24dp"
android:tint="?android:attr/colorControlNormal"
android:tintMode="src_in"
android:scaleType="center"
android:focusable="true"
android:contentDescription="@string/font_size_make_smaller_desc" />
<com.android.settings.widget.LabeledSeekBar
android:id="@+id/seek_bar"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
style="@android:style/Widget.Material.SeekBar.Discrete"/>
<ImageView
android:id="@+id/larger"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_font_size_36dp"
android:tint="?android:attr/colorControlNormal"
android:tintMode="src_in"
android:scaleType="center"
android:focusable="true"
android:contentDescription="@string/font_size_make_larger_desc" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/font_size_summary"
android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/font_size_summary"
android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

1
res/layout/font_size_preview.xml
View File

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

50
res/layout/preview_seek_bar_view_pager.xml Normal file
View File

@@ -0,0 +1,50 @@
<?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="?android:attr/textColorPrimaryInverse"
android:elevation="2dp"/>
</RelativeLayout>

128
res/layout/screen_zoom_activity.xml
View File

@@ -22,78 +22,78 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" >
android:paddingTop="16dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<android.support.v4.view.ViewPager <include layout="@layout/preview_seek_bar_view_pager" />
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"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="6dp" />
<TextView
android:id="@+id/current_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"
android:elevation="2dp" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"> android:paddingTop="16dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<ImageView <com.android.settings.widget.DotsPageIndicator
android:id="@+id/smaller" android:id="@+id/page_indicator"
android:layout_width="48dp" style="@style/PreviewPagerPageIndicator"
android:layout_height="48dp" android:layout_width="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless" android:layout_height="wrap_content"
android:src="@drawable/ic_remove_24dp" android:layout_gravity="center_horizontal"
android:tint="?android:attr/colorControlNormal" android:padding="6dp" />
android:tintMode="src_in"
android:scaleType="center"
android:focusable="true"
android:contentDescription="@string/screen_zoom_make_smaller_desc" />
<com.android.settings.widget.LabeledSeekBar <TextView
android:id="@+id/seek_bar" android:id="@+id/current_label"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_gravity="center_horizontal"
style="@android:style/Widget.Material.SeekBar.Discrete"/> android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"
android:elevation="2dp" />
<ImageView <LinearLayout
android:id="@+id/larger" android:layout_width="match_parent"
android:layout_width="48dp" android:layout_height="wrap_content"
android:layout_height="48dp" android:gravity="center_vertical">
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_add_24dp" <ImageView
android:tint="?android:attr/colorControlNormal" android:id="@+id/smaller"
android:tintMode="src_in" android:layout_width="48dp"
android:scaleType="center" android:layout_height="48dp"
android:focusable="true" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/screen_zoom_make_larger_desc" /> 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" />
<com.android.settings.widget.LabeledSeekBar
android:id="@+id/seek_bar"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
style="@android:style/Widget.Material.SeekBar.Discrete"/>
<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>
<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" />
</LinearLayout> </LinearLayout>
<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" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

74
res/layout/screen_zoom_preview_1.xml
View File

@@ -14,72 +14,10 @@
limitations under the License. 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:scrollbars="none"
android:background="?android:attr/colorBackgroundFloating">
<LinearLayout </ScrollView>
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:orientation="horizontal"
android:theme="?android:attr/actionBarTheme"
style="?android:attr/actionBarStyle">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:text="@string/screen_zoom_preview_title"
android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" />
<ImageView
android:layout_width="36dp"
android:layout_height="48dp"
style="?android:attr/actionOverflowButtonStyle" />
</LinearLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none"
android:background="?android:attr/colorBackgroundFloating">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@android:style/TextAppearance.Material.Subhead"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="@string/permissions_label" />
<include layout="@layout/screen_zoom_preview_item" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="8dp"
android:background="#36000000" />
<include layout="@layout/screen_zoom_preview_item" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="8dp"
android:background="#36000000" />
<include layout="@layout/screen_zoom_preview_item" />
</LinearLayout>
</ScrollView>
</LinearLayout>

74
res/layout/screen_zoom_preview_2.xml
View File

@@ -14,72 +14,10 @@
limitations under the License. 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:scrollbars="none"
android:background="?android:attr/colorBackgroundFloating">
<LinearLayout </ScrollView>
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:orientation="horizontal"
android:theme="?android:attr/actionBarTheme"
style="?android:attr/actionBarStyle">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:text="@string/screen_zoom_preview_title"
android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" />
<ImageView
android:layout_width="36dp"
android:layout_height="48dp"
style="?android:attr/actionOverflowButtonStyle" />
</LinearLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none"
android:background="?android:attr/colorBackgroundFloating">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@android:style/TextAppearance.Material.Subhead"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="@string/permissions_label" />
<include layout="@layout/screen_zoom_preview_item" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="8dp"
android:background="#36000000" />
<include layout="@layout/screen_zoom_preview_item" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="8dp"
android:background="#36000000" />
<include layout="@layout/screen_zoom_preview_item" />
</LinearLayout>
</ScrollView>
</LinearLayout>

65
res/layout/screen_zoom_preview_item.xml
View File

@@ -1,65 +0,0 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="16dp"
tools:showIn="@layout/screen_zoom_preview">
<ImageView
android:id="@+id/icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/screen_zoom_preview_action_background"
android:backgroundTint="?android:attr/colorAccent"
android:src="@drawable/ic_settings_32dp"
android:scaleType="center" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="16dp">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/usage_access"
style="@android:style/TextAppearance.Material.Body1" />
<TextView
android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/usage_access_description"
style="@android:style/TextAppearance.Material.Caption" />
</LinearLayout>
<ImageView
android:id="@+id/action"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="24dp"
android:src="@drawable/ic_info"
android:tint="?android:attr/colorControlNormal"
android:tintMode="src_in"
android:scaleType="center" />
</LinearLayout>

3
res/values/colors.xml
View File

@@ -111,4 +111,7 @@
<color name="material_blue_500">#4285F4</color> <color name="material_blue_500">#4285F4</color>
<color name="material_blue_700">#3367D6</color> <color name="material_blue_700">#3367D6</color>
<!-- Black at 80% opacity -->
<color name="seek_bar_preference_preview_border_tint">#CC000000</color>
</resources> </resources>