diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-18 13:24:07 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-18 13:24:07 +0100 |
| commit | be6b775a7fdb1b8c194bea75ae8f923d9c1b0349 (patch) | |
| tree | c4c0b41bbe878187fb1344cb3978e097c620b8b4 /app/src/main/res/layout-xlarge | |
| parent | 732e1f23d1e00f28ea5e64869737ba2c34e1791e (diff) | |
| parent | ff319e7862b5b6e1592811aa8c6571c7b9a1631c (diff) | |
Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expiration
* fix merge conflicts in:
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
Diffstat (limited to 'app/src/main/res/layout-xlarge')
| -rw-r--r-- | app/src/main/res/layout-xlarge/eip_service_fragment.xml | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 497d2c0b..b7af5797 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -69,41 +69,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - <android.support.v7.widget.AppCompatImageView - android:id="@+id/cirle" + <se.leap.bitmaskclient.views.VpnStateImage + android:id="@+id/vpn_state_image" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginBottom="@dimen/stdpadding" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:layout_margin="@dimen/stdpadding" app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom" app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right" - app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left" app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top" - app:layout_constraintVertical_bias="0.0" - app:srcCompat="@drawable/black_circle" /> - - <android.support.v7.widget.AppCompatImageView - android:id="@+id/key" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginBottom="@dimen/stdpadding" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" - app:layout_constraintBottom_toBottomOf="@+id/cirle" - app:layout_constraintEnd_toEndOf="@+id/cirle" - app:layout_constraintStart_toStartOf="@+id/cirle" - app:layout_constraintTop_toTopOf="@+id/cirle" - app:srcCompat="@drawable/vpn_connected" /> - + app:layout_constraintDimensionRatio="1:1" /> <android.support.v7.widget.AppCompatButton android:id="@+id/vpn_main_button" |