Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SeekBar track and progress should both be 2dp"

Browse Source
This commit is contained in:
Alan Viverette
2015-04-17 23:40:41 +00:00
committed by Android (Google) Code Review
parent 712aa62931 0cb6eba539
commit 044e9f992f
6 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/res/res/drawable/scrubber_control_selector_material.xml → core/res/res/color/seekbar_track_progress_material.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
<!-- 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.
@@ -15,12 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<bitmap android:src="@drawable/scrubber_control_off_mtrl_alpha"
android:tint="?attr/colorControlNormal" />
</item>
<item>
<bitmap android:src="@drawable/scrubber_control_on_mtrl_alpha"
android:tint="?attr/colorControlActivated" />
</item>
<item android:state_enabled="false"
android:color="?attr/colorControlNormal" />
<item android:color="?attr/colorControlActivated" />
</selector>

0
core/res/res/drawable/scrubber_control_material_anim.xml → core/res/res/drawable/seekbar_thumb_material_anim.xml
View File

6
core/res/res/drawable/scrubber_progress_horizontal_material.xml → core/res/res/drawable/seekbar_track_material.xml
View File

@@ -19,7 +19,7 @@
android:gravity="center_vertical|fill_horizontal">
<shape android:shape="rectangle"
android:tint="?attr/colorControlNormal">
<size android:height="@dimen/scrubber_track_height_material" />
<size android:height="@dimen/seekbar_track_background_height_material" />
<solid android:color="@color/white_disabled_material" />
</shape>
</item>
@@ -32,7 +32,7 @@
<item>
<shape android:shape="rectangle"
android:tint="?attr/colorControlActivated">
<size android:height="@dimen/scrubber_track_height_material" />
<size android:height="@dimen/seekbar_track_progress_height_material" />
<solid android:color="@color/white_disabled_material" />
</shape>
</item>
@@ -48,7 +48,7 @@
<item>
<shape android:shape="rectangle"
android:tint="?attr/colorControlActivated">
<size android:height="@dimen/progress_bar_height_material" />
<size android:height="@dimen/seekbar_track_progress_height_material" />
<solid android:color="@color/white" />
</shape>
</item>

5
core/res/res/values/arrays.xml
View File

@@ -352,9 +352,8 @@
<item>@drawable/ratingbar_small_material</item>
<item>@drawable/ratingbar_indicator_material</item>
<item>@drawable/scrollbar_handle_material</item>
<item>@drawable/scrubber_control_material_anim</item>
<item>@drawable/scrubber_control_selector_material</item>
<item>@drawable/scrubber_progress_horizontal_material</item>
<item>@drawable/seekbar_thumb_material_anim</item>
<item>@drawable/seekbar_track_material</item>
<item>@drawable/spinner_background_material</item>
<item>@drawable/spinner_textfield_background_material</item>
<item>@drawable/switch_thumb_material_anim</item>

4
core/res/res/values/dimens_material.xml
View File

@@ -118,7 +118,9 @@
<!-- Padding above and below selection dialog lists. -->
<dimen name="dialog_list_padding_vertical_material">8dp</dimen>
<dimen name="scrubber_track_height_material">2dp</dimen>
<dimen name="seekbar_track_background_height_material">2dp</dimen>
<dimen name="seekbar_track_progress_height_material">2dp</dimen>
<dimen name="progress_bar_height_material">4dp</dimen>
<!-- Material time picker dimensions. -->

6
core/res/res/values/styles_material.xml
View File

@@ -719,9 +719,9 @@ please see styles_device_defaults.xml.
<style name="Widget.Material.SeekBar">
<item name="indeterminateOnly">false</item>
<item name="progressDrawable">@drawable/scrubber_progress_horizontal_material</item>
<item name="indeterminateDrawable">@drawable/scrubber_progress_horizontal_material</item>
<item name="thumb">@drawable/scrubber_control_material_anim</item>
<item name="progressDrawable">@drawable/seekbar_track_material</item>
<item name="indeterminateDrawable">@drawable/seekbar_track_material</item>
<item name="thumb">@drawable/seekbar_thumb_material_anim</item>
<item name="splitTrack">true</item>
<item name="focusable">true</item>
<item name="paddingStart">16dip</item>