diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-02 22:58:16 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-19 22:18:08 -0600 |
| commit | 6f9cb39e79ff97bcd5e0635cb67f9a8f23f2b486 (patch) | |
| tree | 25f0d69246b66e5277c1d00d18e24b366b440d47 | |
| parent | 99b65032fae646293a6e7ddeaa8553d9e0590f3d (diff) | |
Change EIP switch label to "Encrypted Internet"
| -rw-r--r-- | res/layout/eip_service_fragment.xml | 15 | ||||
| -rwxr-xr-x | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/se/leap/leapclient/Dashboard.java | 4 |
3 files changed, 4 insertions, 18 deletions
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml index 885c78a3..e67f5651 100644 --- a/res/layout/eip_service_fragment.xml +++ b/res/layout/eip_service_fragment.xml @@ -15,19 +15,6 @@ android:clickable="true" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView - android:id="@+id/eipType" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/eipLabel" - android:layout_marginLeft="10dp" - android:layout_marginBottom="10dp" - android:layout_toRightOf="@+id/eipLabel" - android:clickable="true" - android:onClick="toggleEipOverview" - android:text="@string/eip_type_active" - android:textAppearance="?android:attr/textAppearanceMedium" /> <Switch android:id="@+id/eipSwitch" @@ -54,7 +41,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_below="@+id/eipType" + android:layout_below="@+id/eipLabel" android:paddingBottom="10dp" android:paddingLeft="10dp" android:paddingRight="10dp" diff --git a/res/values/strings.xml b/res/values/strings.xml index cef7de1e..532d2379 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -261,8 +261,7 @@ <string name="provider_label_none">No provider configured</string> <string name="eip_settings_button_description">Access EIP connection settings</string> <string name="eip_status">Status unknown</string> - <string name="eip_service_label">EIP:</string> - <string name="eip_type_active">EIP</string> + <string name="eip_service_label">Encrypted Internet</string> <string name="title_activity_configuration_wizard">Configure LEAP</string> <string name="new_provider_button">Select new Provider</string> <string name="introduce_new_provider">Introduce new provider</string> diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java index 96f542bf..3a50ad1e 100644 --- a/src/se/leap/leapclient/Dashboard.java +++ b/src/se/leap/leapclient/Dashboard.java @@ -56,8 +56,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf super.onCreate(savedInstanceState); app = this; - - setContentView(R.layout.client_dashboard); ConfigHelper.setSharedPreferences(getSharedPreferences(ConfigHelper.PREFERENCES_KEY, MODE_PRIVATE)); preferences = ConfigHelper.shared_preferences; @@ -119,6 +117,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf provider = Provider.getInstance(); provider.init( this ); + setContentView(R.layout.client_dashboard); + providerNameTV = (TextView) findViewById(R.id.providerName); providerNameTV.setText(provider.getDomain()); providerNameTV.setTextSize(28); |