Skip to content

Commit

Permalink
Merge pull request #48 from bmx666/master
Browse files Browse the repository at this point in the history
fix default range/track drawable for API 21/23 related to #47
  • Loading branch information
djodjoni authored Jan 17, 2017
2 parents b16f28e + eab7fb7 commit 77f9a47
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 9 deletions.
7 changes: 2 additions & 5 deletions lib/src/main/res/drawable-v21/multislider_range_material.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical|fill_horizontal">
<shape android:shape="rectangle"
android:tint="?android:attr/colorControlActivated">
<size android:height="@dimen/multislider_range_height_material"/>
<solid android:color="@color/white"/>
</shape>
<nine-patch android:src="@drawable/multislider_primary_mtrl_alpha"
android:tint="?android:attr/colorControlActivated" />
</item>
</layer-list>
6 changes: 2 additions & 4 deletions lib/src/main/res/drawable-v21/multislider_track_material.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical|fill_horizontal">
<shape android:shape="rectangle"
android:tint="?android:attr/colorControlNormal">
<size android:height="@dimen/multislider_track_height_material" />
</shape>
<nine-patch android:src="@drawable/multislider_track_mtrl_alpha"
android:tint="?android:attr/colorControlNormal" />
</item>
</layer-list>
25 changes: 25 additions & 0 deletions lib/src/main/res/drawable-v23/multislider_range_material.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical|fill_horizontal">
<shape android:shape="rectangle"
android:tint="?android:attr/colorControlActivated">
<size android:height="@dimen/multislider_range_height_material"/>
<solid android:color="@color/white"/>
</shape>
</item>
</layer-list>
24 changes: 24 additions & 0 deletions lib/src/main/res/drawable-v23/multislider_track_material.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical|fill_horizontal">
<shape android:shape="rectangle"
android:tint="?android:attr/colorControlNormal">
<size android:height="@dimen/multislider_track_height_material" />
</shape>
</item>
</layer-list>

0 comments on commit 77f9a47

Please sign in to comment.