Merge branch 'v2.4' into q-beta

This commit is contained in:
Mygod
2019-05-13 18:45:37 +08:00
4 changed files with 13 additions and 11 deletions

View File

@@ -3,6 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper"/>
<variable
name="data"
type="be.mygod.vpnhotspot.manage.RepeaterManager.Data"/>
@@ -73,7 +74,7 @@
android:background="?android:attr/selectableItemBackground"
android:padding="16dp"
android:onClick="@{_ -> data.wps()}"
android:visibility="@{data.serviceStarted}">
android:visibility="@{data.serviceStarted &amp;&amp; WifiP2pManagerHelper.startWps != null}">
<Space
android:layout_width="40dp"