diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-10 20:07:20 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-10 20:07:20 +0100 |
| commit | 6a02a96946393956031dc2d0223fe8c0ebe7db37 (patch) | |
| tree | 57700955ae54a19fcad8342bb67397712dce69c7 | |
| parent | b727f5a38b26e85245e4e3001ce258d90f0170b8 (diff) | |
| parent | c9918258ffd14ea3c3b9a936ba8a01add946920c (diff) | |
Merge branch 'bug/top-padding-5260' into develop
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 4 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderListFragment.java | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d4e84d3a..9a603d68 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -94,7 +94,6 @@ <string name="authed_secured_status">Connection secure using your own certificate.</string> <string name="eip_service_label">Encrypted Internet</string> <string name="title_activity_configuration_wizard">Select a service provider</string> - <string name="top_padding">Top padding</string> <string name="new_provider_button">Add new Provider</string> <string name="introduce_new_provider">Add a new service provider</string> <string name="save">Save</string> diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index e5ad5b3d..1c5f6048 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -137,9 +137,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD public void refreshProviderList(int top_padding) {
ProviderListFragment new_provider_list_fragment = new ProviderListFragment();
Bundle top_padding_bundle = new Bundle();
- top_padding_bundle.putInt(getResources().getString(R.string.top_padding), top_padding);
+ top_padding_bundle.putInt(ProviderListFragment.TOP_PADDING, top_padding);
new_provider_list_fragment.setArguments(top_padding_bundle);
-
+
FragmentManager fragmentManager = getFragmentManager();
fragmentManager.beginTransaction()
.replace(R.id.configuration_wizard_layout, new_provider_list_fragment, ProviderListFragment.TAG)
diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index 45047982..f35cf739 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -39,7 +39,7 @@ public class ProviderListFragment extends ListFragment { public static String TAG = "provider_list_fragment";
public static String SHOW_ALL_PROVIDERS = "show_all_providers";
-
+ public static String TOP_PADDING = "top padding from providerlistfragment";
private ProviderListAdapter<ProviderItem> content_adapter;
/**
@@ -120,9 +120,8 @@ public class ProviderListFragment extends ListFragment { && savedInstanceState.containsKey(STATE_ACTIVATED_POSITION)) {
setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION));
}
- String top_padding_key = getResources().getString(R.string.top_padding);
- if(getArguments() != null && getArguments().containsKey(top_padding_key)) {
- int topPadding = getArguments().getInt(top_padding_key);
+ if(getArguments() != null && getArguments().containsKey(TOP_PADDING)) {
+ int topPadding = getArguments().getInt(TOP_PADDING);
View current_view = getView();
getView().setPadding(current_view.getPaddingLeft(), topPadding, current_view.getPaddingRight(), current_view.getPaddingBottom());
}
|