Skip to content

Commit d368ffc

Browse files
authored
Merge pull request #391 from wordpress-mobile/issue/add-ellipsis-disabled
Issue/add ellipsis disabled
2 parents 7411754 + 4b6dc1d commit d368ffc

5 files changed

+52
-2
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<vector
4+
xmlns:android="http://schemas.android.com/apk/res/android"
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
9+
10+
<!-- @color/grey_lighten_20 -->
11+
<path
12+
android:fillColor="#ffc8d7e1"
13+
android:pathData="M18.5,24c0,1.2-1,2.2-2.2,2.2s-2.2-1-2.2-2.2s1-2.2,2.2-2.2S18.5,22.8,18.5,24z M31.6,21.8c-1.2,0-2.2,1-2.2,2.2 s1,2.2,2.2,2.2c1.2,0,2.2-1,2.2-2.2S32.8,21.8,31.6,21.8z M24,21.8c-1.2,0-2.2,1-2.2,2.2s1,2.2,2.2,2.2c1.2,0,2.2-1,2.2-2.2 S25.2,21.8,24,21.8z" >
14+
</path>
15+
16+
</vector>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<selector
4+
xmlns:android="http://schemas.android.com/apk/res/android" >
5+
6+
<item android:drawable="@drawable/format_bar_button_ellipsis_horizontal_disabled" android:state_enabled="false" />
7+
<item android:drawable="@drawable/format_bar_button_ellipsis_horizontal" />
8+
9+
</selector>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<vector
4+
xmlns:android="http://schemas.android.com/apk/res/android"
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
9+
10+
<!-- @color/grey_lighten_20 -->
11+
<path
12+
android:fillColor="#ffc8d7e1"
13+
android:pathData="M23.9,29.4c1.2,0,2.2,1,2.2,2.2c0,1.2-1,2.2-2.2,2.2s-2.2-1-2.2-2.2C21.7,30.4,22.7,29.4,23.9,29.4z M21.7,16.3 c0,1.2,1,2.2,2.2,2.2s2.2-1,2.2-2.2c0-1.2-1-2.2-2.2-2.2S21.7,15.1,21.7,16.3z M21.7,23.9c0,1.2,1,2.2,2.2,2.2s2.2-1,2.2-2.2 s-1-2.2-2.2-2.2S21.7,22.7,21.7,23.9z" >
14+
</path>
15+
16+
</vector>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<selector
4+
xmlns:android="http://schemas.android.com/apk/res/android" >
5+
6+
<item android:drawable="@drawable/format_bar_button_ellipsis_vertical_disabled" android:state_enabled="false" />
7+
<item android:drawable="@drawable/format_bar_button_ellipsis_vertical" />
8+
9+
</selector>

aztec/src/main/res/layout/aztec_format_bar_advanced.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179

180180
<org.wordpress.aztec.toolbar.RippleToggleButton
181181
android:id="@+id/format_bar_button_ellipsis_expand"
182-
android:background="@drawable/format_bar_button_ellipsis_horizontal"
182+
android:background="@drawable/format_bar_button_ellipsis_horizontal_selector"
183183
android:contentDescription="@string/format_bar_description_ellipsis_expand"
184184
android:layout_alignParentRight="true"
185185
android:layout_alignRight="@+id/format_bar_button_layout_expanded"
@@ -190,7 +190,7 @@
190190

191191
<org.wordpress.aztec.toolbar.RippleToggleButton
192192
android:id="@+id/format_bar_button_ellipsis_collapse"
193-
android:background="@drawable/format_bar_button_ellipsis_vertical"
193+
android:background="@drawable/format_bar_button_ellipsis_vertical_selector"
194194
android:contentDescription="@string/format_bar_description_ellipsis_collapse"
195195
android:layout_height="fill_parent"
196196
android:layout_toRightOf="@+id/format_bar_button_layout_expanded"

0 commit comments

Comments
 (0)