Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ee5364870f
2 changed files with 3 additions and 1 deletions
|
@ -48,6 +48,7 @@
|
||||||
android:layout_marginRight="2dip"
|
android:layout_marginRight="2dip"
|
||||||
android:button="@drawable/ic_btn_wocheckbox"
|
android:button="@drawable/ic_btn_wocheckbox"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
|
android:clickable="false"
|
||||||
/>
|
/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,8 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginRight="2dip"
|
android:layout_marginRight="2dip"
|
||||||
android:focusable="false" />
|
android:focusable="false"
|
||||||
|
android:clickable="false"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
Loading…
Reference in a new issue