diff options
author | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
commit | a95567b4bbb2319636a79cc5e8d6a7921df9f4d1 (patch) | |
tree | 7d5c7c36b141aa98e909f6b99baed769de5cf923 /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | |
parent | fda23fc8c5aa916bce4ce985fcdf0aa08b21f1e6 (diff) | |
parent | 54e95a61bc553d985f6c55823da20985b6103aa0 (diff) |
Merge branch 'cleanup' into 'master'
cleanup - rename layout files
See merge request leap/bitmask_android!64
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java index 75fffaf7..e0d6e27d 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java @@ -28,7 +28,6 @@ import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.LocalBroadcastManager; import android.util.Log; -import android.view.Menu; import android.widget.ListView; import com.pedrogomez.renderers.Renderer; @@ -47,7 +46,6 @@ import butterknife.InjectView; import butterknife.OnItemClick; import se.leap.bitmaskclient.fragments.AboutFragment; -import static se.leap.bitmaskclient.Constants.APP_ACTION_QUIT; import static se.leap.bitmaskclient.Constants.BROADCAST_PROVIDER_API_EVENT; import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE; import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY; @@ -167,7 +165,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity } private void setUpInitialUI() { - setContentView(R.layout.provider_list_activity); + setContentView(R.layout.a_provider_list); setProviderHeaderText(R.string.setup_provider); hideProgressBar(); } |