diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-09-07 15:26:48 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-09-07 15:26:48 +0100 |
| commit | 2a478d7674c8754477d02dc8d221d7466e95702b (patch) | |
| tree | 3a9016551bc6789c44e89374627e3c178964e55e /android/src/main/res | |
| parent | 70de9106fb2be220e47458d7843acf64747bc1b0 (diff) | |
| parent | 88d67bd50bca6e25a3c18c0c855b1991fde865ac (diff) | |
| download | mullvadvpn-2a478d7674c8754477d02dc8d221d7466e95702b.tar.xz mullvadvpn-2a478d7674c8754477d02dc8d221d7466e95702b.zip | |
Merge branch 'android-show-key-age'
Diffstat (limited to 'android/src/main/res')
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 9 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index da2bb39207..e86d59aefb 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -69,12 +69,17 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:paddingTop="3dp" android:textAllCaps="false" android:textColor="@color/white60" android:textSize="14sp" android:textStyle="bold" /> - + <TextView + android:id="@+id/wireguard_key_age" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingVertical="2dp" + android:textSize="14sp" + android:gravity="center"/> <TextView android:id="@+id/wireguard_key_status" android:layout_width="wrap_content" diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 0ddba635d5..a2e017b962 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -118,6 +118,7 @@ <string name="wireguard_generate_key">Generate key</string> <string name="wireguard_replace_key">Replace key</string> <string name="wireguard_manage_keys">Manage keys</string> + <string name="wireguard_key_age">Key generated on</string> <string name="wireguard_key_connectivity"> Connectivity required to manage your key. </string> |