diff options
| author | cyberta <cyberta@riseup.net> | 2017-09-29 07:27:19 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-09-29 07:27:19 +0000 |
| commit | fc913a46cfc85c0bdb0c9d19b2c94c8b53f93b1f (patch) | |
| tree | 247408a15cd7caf621206d574af61d0c16d25876 /app/src/main/res/layout | |
| parent | 51afe1eeba990c2cd57bd842a96f7a756df51ce8 (diff) | |
| parent | 7322b8e01f852bb4d0243a6ff2fc563422ba274c (diff) | |
Merge branch 'feature/updateDependencies' into 'master'
Feature/update dependencies
See merge request leap/bitmask_android!8
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/vpnstatus.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 7df82b19..c8370cf1 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -24,14 +24,14 @@ android:layout_centerInParent="true"> <Button - android:id="@+id/vpn.main.button" + android:id="@+id/vpn_main_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="12sp" /> <mbanje.kurt.fabbutton.FabButton - android:id="@+id/vpn.Status.Image" + android:id="@+id/vpn_status_image" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginLeft="3dp" diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml index b304ad10..3b464b62 100644 --- a/app/src/main/res/layout/vpnstatus.xml +++ b/app/src/main/res/layout/vpnstatus.xml @@ -43,8 +43,9 @@ style="@style/logWindowStatusTitle"/> <TextView + android:id="@+id/speedStatus" - tools:text="Connected" + tools:text="Connected to a very long ipv4 and 3483489348238824829482384928" style="@style/logWindowStatusText"/> |