summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-02-08 15:21:55 +0100
committerFup Duck <fupduck@sacknagel.com>2018-02-08 15:21:55 +0100
commita14bfd300dccd79dbd3685710e5d8b40b5906a41 (patch)
tree996be52accafc408b84d68fc89a6b0731ceed729 /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
parentae2813a0fe77c265a42221f6153d8f5bca26a467 (diff)
parentae938c20a11b6195936f97eebd32abd35335bceb (diff)
Merge branch 'leap_0.9.8' into 8827_handle_switch_provider
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index c89e7a49..b2daff82 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -178,7 +178,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
}
private void setUpInitialUI() {
- setContentView(R.layout.configuration_wizard_activity);
+ setContentView(R.layout.provider_list_activity);
setProviderHeaderText(R.string.setup_provider);
hideProgressBar();
}