summaryrefslogtreecommitdiff
path: root/app/src/production
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2018-03-06 10:08:49 -0800
committercyberta <cyberta@riseup.net>2018-03-06 10:08:49 -0800
commita95567b4bbb2319636a79cc5e8d6a7921df9f4d1 (patch)
tree7d5c7c36b141aa98e909f6b99baed769de5cf923 /app/src/production
parentfda23fc8c5aa916bce4ce985fcdf0aa08b21f1e6 (diff)
parent54e95a61bc553d985f6c55823da20985b6103aa0 (diff)
Merge branch 'cleanup' into 'master'
cleanup - rename layout files See merge request leap/bitmask_android!64
Diffstat (limited to 'app/src/production')
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java2
-rw-r--r--app/src/production/res/layout-xlarge/d_new_provider.xml (renamed from app/src/production/res/layout-xlarge/new_provider_dialog.xml)0
-rw-r--r--app/src/production/res/layout/d_new_provider.xml (renamed from app/src/production/res/layout/new_provider_dialog.xml)0
3 files changed, 1 insertions, 1 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
index 025d5263..cce49d9b 100644
--- a/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -65,7 +65,7 @@ public class NewProviderDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
LayoutInflater inflater = getActivity().getLayoutInflater();
- View view = inflater.inflate(R.layout.new_provider_dialog, null);
+ View view = inflater.inflate(R.layout.d_new_provider, null);
ButterKnife.inject(this, view);
Bundle arguments = getArguments();
if (arguments != null) {
diff --git a/app/src/production/res/layout-xlarge/new_provider_dialog.xml b/app/src/production/res/layout-xlarge/d_new_provider.xml
index 12616625..12616625 100644
--- a/app/src/production/res/layout-xlarge/new_provider_dialog.xml
+++ b/app/src/production/res/layout-xlarge/d_new_provider.xml
diff --git a/app/src/production/res/layout/new_provider_dialog.xml b/app/src/production/res/layout/d_new_provider.xml
index 36eb0d6a..36eb0d6a 100644
--- a/app/src/production/res/layout/new_provider_dialog.xml
+++ b/app/src/production/res/layout/d_new_provider.xml