diff options
| author | cyBerta <cyberta@riseup.net> | 2018-05-12 01:58:20 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-05-12 01:58:20 +0200 |
| commit | 974a1d28fce969489c0cd4a401f1b51ce0b9cd94 (patch) | |
| tree | 17b9c90bed8b3cbb02a56be5b84675f8094e30f0 /app/src/production | |
| parent | c5f445fabcbfa6f045aa5f3e5341909468259aed (diff) | |
| parent | 5122945a6860caeb46359540ae2a1382f8aab415 (diff) | |
Merge branch 'master' into #8889_revise_NavigationDrawer
Diffstat (limited to 'app/src/production')
| -rw-r--r-- | app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java | 2 | ||||
| -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 |