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

Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev

Browse Source
This commit is contained in:
Noah Wang
2016-04-19 17:56:49 +00:00
committed by Android (Google) Code Review
parent c3ab03ecdb 35a95617fd
commit 4f63bb69f5
12 changed files with 232 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -1478,8 +1478,7 @@
<activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity" <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
android:label="@string/vision_settings_title" android:label="@string/vision_settings_title"
android:theme="@style/SetupWizardAccessibilityTheme" android:theme="@style/SetupWizardAccessibilityTheme"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard" >
android:configChanges="orientation|keyboardHidden|screenSize" >
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" /> <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

58
res/layout-h360dp/font_size_activity.xml → res/layout-land/font_size_activity.xml
View File

@@ -14,18 +14,34 @@
limitations under the License. limitations under the License.
--> -->
<ScrollView 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:fillViewport="true"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" > android:layout_weight="1"
android:layout_height="match_parent">
<include layout="@layout/preview_seek_bar_view_pager" /> <include layout="@layout/preview_seek_bar_view_pager" />
<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" />
</LinearLayout>
<ScrollView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -34,14 +50,6 @@
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<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 <TextView
android:id="@+id/current_label" android:id="@+id/current_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -51,16 +59,22 @@
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView" android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp" />
<LinearLayout <com.android.settings.widget.LabeledSeekBar
android:id="@+id/seek_bar"
android:layout_width="match_parent"
android:layout_height="48dp"
style="@android:style/Widget.Material.SeekBar.Discrete" />
<RelativeLayout
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:gravity="center_vertical">
android:paddingTop="8dp">
<ImageView <ImageView
android:id="@+id/smaller" android:id="@+id/smaller"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentStart="true"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_font_size_16dp" android:src="@drawable/ic_font_size_16dp"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"
@@ -69,17 +83,11 @@
android:focusable="true" android:focusable="true"
android:contentDescription="@string/font_size_make_smaller_desc" /> 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 <ImageView
android:id="@+id/larger" android:id="@+id/larger"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_font_size_24dp" android:src="@drawable/ic_font_size_24dp"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"
@@ -87,7 +95,7 @@
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"
android:contentDescription="@string/font_size_make_larger_desc" /> android:contentDescription="@string/font_size_make_larger_desc" />
</LinearLayout> </RelativeLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -96,5 +104,5 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
</LinearLayout> </LinearLayout>
</LinearLayout> </ScrollView>
</ScrollView> </LinearLayout>

55
res/layout-h360dp/screen_zoom_activity.xml → res/layout-land/screen_zoom_activity.xml
View File

@@ -14,18 +14,34 @@
limitations under the License. limitations under the License.
--> -->
<ScrollView 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:fillViewport="true"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" > android:layout_weight="1"
android:layout_height="match_parent" >
<include layout="@layout/preview_seek_bar_view_pager" /> <include layout="@layout/preview_seek_bar_view_pager" />
<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" />
</LinearLayout>
<ScrollView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -34,14 +50,6 @@
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<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 <TextView
android:id="@+id/current_label" android:id="@+id/current_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -51,7 +59,13 @@
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView" android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp" />
<LinearLayout <com.android.settings.widget.LabeledSeekBar
android:id="@+id/seek_bar"
android:layout_width="match_parent"
android:layout_height="48dp"
style="@android:style/Widget.Material.SeekBar.Discrete"/>
<RelativeLayout
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:gravity="center_vertical">
@@ -60,6 +74,7 @@
android:id="@+id/smaller" android:id="@+id/smaller"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentStart="true"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_remove_24dp" android:src="@drawable/ic_remove_24dp"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"
@@ -68,17 +83,11 @@
android:focusable="true" android:focusable="true"
android:contentDescription="@string/screen_zoom_make_smaller_desc" /> 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 <ImageView
android:id="@+id/larger" android:id="@+id/larger"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_add_24dp" android:src="@drawable/ic_add_24dp"
android:tint="?android:attr/textColorPrimary" android:tint="?android:attr/textColorPrimary"
@@ -86,7 +95,7 @@
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"
android:contentDescription="@string/screen_zoom_make_larger_desc" /> android:contentDescription="@string/screen_zoom_make_larger_desc" />
</LinearLayout> </RelativeLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -95,5 +104,5 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
</LinearLayout> </LinearLayout>
</LinearLayout> </ScrollView>
</ScrollView> </LinearLayout>

1
res/layout/conversation_message_content.xml
View File

@@ -25,7 +25,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:minHeight="@dimen/conversation_message_contact_icon_size"
android:layout_marginTop="0dp" > android:layout_marginTop="0dp" >
<TextView <TextView

4
res/layout/conversation_message_icon.xml
View File

@@ -16,8 +16,8 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/conversation_icon" android:id="@+id/conversation_icon"
android:layout_width="@dimen/conversation_message_contact_icon_size" android:layout_width="wrap_content"
android:layout_height="@dimen/conversation_message_contact_icon_size" android:layout_height="wrap_content"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:textStyle="bold" android:textStyle="bold"
android:textSize="@dimen/conversation_message_contact_icon_text_size" android:textSize="@dimen/conversation_message_contact_icon_text_size"

114
res/layout/font_size_activity.xml
View File

@@ -22,63 +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">
<TextView <include layout="@layout/preview_seek_bar_view_pager" />
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_16dp" android:layout_gravity="center_horizontal"
android:tint="?android:attr/textColorPrimary" 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_24dp"
android:tint="?android:attr/textColorPrimary" <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_16dp"
android:tint="?android:attr/textColorPrimary"
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_24dp"
android:tint="?android:attr/textColorPrimary"
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/preview_seek_bar_view_pager.xml
View File

@@ -19,7 +19,6 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:minHeight="@dimen/preview_pager_min_height"
android:padding="@dimen/preview_pager_padding" android:padding="@dimen/preview_pager_padding"
android:background="@drawable/preview_seek_bar_outline" > android:background="@drawable/preview_seek_bar_outline" >

112
res/layout/screen_zoom_activity.xml
View File

@@ -22,62 +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">
<TextView <include layout="@layout/preview_seek_bar_view_pager" />
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/textColorPrimary" 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/textColorPrimary" 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/textColorPrimary"
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/textColorPrimary"
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>

6
res/values/dimens.xml
View File

@@ -263,10 +263,8 @@
<dimen name="unmount_button_padding">8dp</dimen> <dimen name="unmount_button_padding">8dp</dimen>
<!-- Display, Screen zoom --> <!-- Display, Screen zoom -->
<dimen name="screen_zoom_preview_height">240dp</dimen>
<dimen name="screen_zoom_preview_app_icon_width">88dp</dimen> <dimen name="screen_zoom_preview_app_icon_width">88dp</dimen>
<dimen name="conversation_message_list_padding">10dp</dimen> <dimen name="conversation_message_list_padding">10dp</dimen>
<dimen name="conversation_message_contact_icon_size">42dp</dimen>
<dimen name="conversation_message_contact_icon_text_size">32sp</dimen> <dimen name="conversation_message_contact_icon_text_size">32sp</dimen>
<dimen name="conversation_message_text_size">16sp</dimen> <dimen name="conversation_message_text_size">16sp</dimen>
<dimen name="conversation_status_text_size">12sp</dimen> <dimen name="conversation_status_text_size">12sp</dimen>
@@ -282,9 +280,6 @@
<dimen name="accessibility_layout_margin_start_end">24dp</dimen> <dimen name="accessibility_layout_margin_start_end">24dp</dimen>
<dimen name="accessibility_button_preference_padding_top_bottom">18dp</dimen> <dimen name="accessibility_button_preference_padding_top_bottom">18dp</dimen>
<!-- Accessibility, Font size -->
<dimen name="font_size_preview_height">240dp</dimen>
<!-- Accessibility, Screen magnification. These values are meant to be relative values and the actual layout value will be set programmatically. --> <!-- Accessibility, Screen magnification. These values are meant to be relative values and the actual layout value will be set programmatically. -->
<dimen name="screen_magnification_video_background_width">750dp</dimen> <dimen name="screen_magnification_video_background_width">750dp</dimen>
<dimen name="screen_magnification_video_background_height">383dp</dimen> <dimen name="screen_magnification_video_background_height">383dp</dimen>
@@ -297,7 +292,6 @@
<!-- Display Size and Font Size preview screen --> <!-- Display Size and Font Size preview screen -->
<dimen name="preview_pager_padding">8dp</dimen> <dimen name="preview_pager_padding">8dp</dimen>
<dimen name="preview_pager_min_height">240dp</dimen>
<!-- Padding between the radio buttons/checkbox and text on the redaction interstitial --> <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->
<dimen name="redaction_padding_start">16dp</dimen> <dimen name="redaction_padding_start">16dp</dimen>

34
src/com/android/settings/PreviewSeekBarPreferenceFragment.java
View File

@@ -156,21 +156,19 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc
} }
mPreviewPager = (ViewPager) content.findViewById(R.id.preview_pager); mPreviewPager = (ViewPager) content.findViewById(R.id.preview_pager);
if (mPreviewPager != null) { mPreviewPagerAdapter = new PreviewPagerAdapter(context, isLayoutRtl,
mPreviewPagerAdapter = new PreviewPagerAdapter(context, isLayoutRtl, mPreviewSampleResIds, configurations);
mPreviewSampleResIds, configurations); mPreviewPager.setAdapter(mPreviewPagerAdapter);
mPreviewPager.setAdapter(mPreviewPagerAdapter); mPreviewPager.setCurrentItem(isLayoutRtl ? mPreviewSampleResIds.length - 1 : 0);
mPreviewPager.setCurrentItem(isLayoutRtl ? mPreviewSampleResIds.length - 1 : 0); mPreviewPager.addOnPageChangeListener(mPreviewPageChangeListener);
mPreviewPager.addOnPageChangeListener(mPreviewPageChangeListener);
mPageIndicator = (DotsPageIndicator) content.findViewById(R.id.page_indicator); mPageIndicator = (DotsPageIndicator) content.findViewById(R.id.page_indicator);
if (mPreviewSampleResIds.length > 1) { if (mPreviewSampleResIds.length > 1) {
mPageIndicator.setViewPager(mPreviewPager); mPageIndicator.setViewPager(mPreviewPager);
mPageIndicator.setVisibility(View.VISIBLE); mPageIndicator.setVisibility(View.VISIBLE);
mPageIndicator.setOnPageChangeListener(mPageIndicatorPageChangeListener); mPageIndicator.setOnPageChangeListener(mPageIndicatorPageChangeListener);
} else { } else {
mPageIndicator.setVisibility(View.GONE); mPageIndicator.setVisibility(View.GONE);
}
} }
setPreviewLayer(mInitialIndex, false); setPreviewLayer(mInitialIndex, false);
@@ -191,11 +189,9 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc
mLabel.setText(mEntries[index]); mLabel.setText(mEntries[index]);
mSmaller.setEnabled(index > 0); mSmaller.setEnabled(index > 0);
mLarger.setEnabled(index < mEntries.length - 1); mLarger.setEnabled(index < mEntries.length - 1);
if (mPreviewPager != null) { setPagerIndicatorContentDescription(mPreviewPager.getCurrentItem());
setPagerIndicatorContentDescription(mPreviewPager.getCurrentItem()); mPreviewPagerAdapter.setPreviewLayer(index, mCurrentIndex,
mPreviewPagerAdapter.setPreviewLayer(index, mCurrentIndex, mPreviewPager.getCurrentItem(), animate);
mPreviewPager.getCurrentItem(), animate);
}
mCurrentIndex = index; mCurrentIndex = index;
} }

8
src/com/android/settings/display/ConversationMessageView.java
View File

@@ -96,13 +96,15 @@ public class ConversationMessageView extends FrameLayout {
updateViewAppearance(); updateViewAppearance();
final int horizontalSpace = MeasureSpec.getSize(widthMeasureSpec); final int horizontalSpace = MeasureSpec.getSize(widthMeasureSpec);
final int iconSize = getResources()
.getDimensionPixelSize(R.dimen.conversation_message_contact_icon_size);
final int unspecifiedMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); final int unspecifiedMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
final int iconMeasureSpec = MeasureSpec.makeMeasureSpec(iconSize, MeasureSpec.EXACTLY); int iconMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
mContactIconView.measure(iconMeasureSpec, iconMeasureSpec); mContactIconView.measure(iconMeasureSpec, iconMeasureSpec);
iconMeasureSpec = MeasureSpec.makeMeasureSpec(
Math.max(mContactIconView.getMeasuredWidth(), mContactIconView.getMeasuredHeight()),
MeasureSpec.EXACTLY);
mContactIconView.measure(iconMeasureSpec, iconMeasureSpec);
final int arrowWidth = final int arrowWidth =
getResources().getDimensionPixelSize(R.dimen.message_bubble_arrow_width); getResources().getDimensionPixelSize(R.dimen.message_bubble_arrow_width);

21
src/com/android/settings/widget/LabeledSeekBar.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.widget; package com.android.settings.widget;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
@@ -24,6 +25,7 @@ import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.support.v4.widget.ExploreByTouchHelper; import android.support.v4.widget.ExploreByTouchHelper;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
@@ -121,8 +123,12 @@ public class LabeledSeekBar extends SeekBar {
private class LabeledSeekBarExploreByTouchHelper extends ExploreByTouchHelper { private class LabeledSeekBarExploreByTouchHelper extends ExploreByTouchHelper {
private boolean mIsLayoutRtl;
public LabeledSeekBarExploreByTouchHelper(LabeledSeekBar forView) { public LabeledSeekBarExploreByTouchHelper(LabeledSeekBar forView) {
super(forView); super(forView);
mIsLayoutRtl = forView.getResources().getConfiguration()
.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
} }
@Override @Override
@@ -192,20 +198,23 @@ public class LabeledSeekBar extends SeekBar {
} }
private int getVirtualViewIdIndexFromX(float x) { private int getVirtualViewIdIndexFromX(float x) {
final int posBase = Math.max(0, int posBase = Math.max(0,
((int) x - LabeledSeekBar.this.getPaddingStart()) / getHalfVirtualViewWidth()); ((int) x - LabeledSeekBar.this.getPaddingStart()) / getHalfVirtualViewWidth());
return (posBase + 1) / 2; posBase = (posBase + 1) / 2;
return mIsLayoutRtl ? LabeledSeekBar.this.getMax() - posBase : posBase;
} }
private Rect getBoundsInParentFromVirtualViewId(int virtualViewId) { private Rect getBoundsInParentFromVirtualViewId(int virtualViewId) {
int left = (virtualViewId * 2 - 1) * getHalfVirtualViewWidth() final int updatedVirtualViewId = mIsLayoutRtl
? LabeledSeekBar.this.getMax() - virtualViewId : virtualViewId;
int left = (updatedVirtualViewId * 2 - 1) * getHalfVirtualViewWidth()
+ LabeledSeekBar.this.getPaddingStart(); + LabeledSeekBar.this.getPaddingStart();
int right = (virtualViewId * 2 + 1) * getHalfVirtualViewWidth() int right = (updatedVirtualViewId * 2 + 1) * getHalfVirtualViewWidth()
+ LabeledSeekBar.this.getPaddingStart(); + LabeledSeekBar.this.getPaddingStart();
// Edge case // Edge case
left = virtualViewId == 0 ? 0 : left; left = updatedVirtualViewId == 0 ? 0 : left;
right = virtualViewId == LabeledSeekBar.this.getMax() right = updatedVirtualViewId == LabeledSeekBar.this.getMax()
? LabeledSeekBar.this.getWidth() : right; ? LabeledSeekBar.this.getWidth() : right;
final Rect r = new Rect(); final Rect r = new Rect();