Merge "SeekBar track and progress should both be 2dp" (044e9f99) · Commits · e / os / android_frameworks_base

core/res/res/drawable/scrubber_control_selector_material.xml→core/res/res/color/seekbar_track_progress_material.xml

+4 −9

Original line number	Diff line number	Diff line
		<?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 −0

File moved.

+3 −3

Original line number	Diff line number	Diff line
		@@ -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>

+2 −3

Original line number	Diff line number	Diff line
		@@ -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>

+3 −1

Original line number	Diff line number	Diff line
		@@ -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. -->