diff --git a/res/layout/status.xml b/res/layout/status.xml index ece9a33e1..5216d84a2 100644 --- a/res/layout/status.xml +++ b/res/layout/status.xml @@ -49,7 +49,7 @@ android:id="@+id/statusText" android:text="@string/status_not_connected" android:textColor="@android:color/white" - android:textSize="20dp" + android:textSize="18dp" android:paddingLeft="5dp" android:layout_centerVertical="true" android:layout_width="wrap_content" @@ -88,7 +88,7 @@ android:id="@+id/exit" android:text="@string/menu_exit" android:textColor="@android:color/white" - android:textSize="20dp" + android:textSize="18dp" android:layout_centerVertical="true" android:layout_width="wrap_content" android:layout_height="match_parent" diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java index 875f6f2bf..128bd19e5 100644 --- a/src/org/linphone/StatusFragment.java +++ b/src/org/linphone/StatusFragment.java @@ -119,7 +119,7 @@ public class StatusFragment extends Fragment { if (getResources().getBoolean(R.bool.lock_statusbar)) { return; } - + if (getResources().getBoolean(R.bool.disable_animations)) { drawer.toggle(); } else { @@ -141,7 +141,7 @@ public class StatusFragment extends Fragment { private void populateSliderContent() { if (LinphoneManager.isInstanciated() && LinphoneManager.getLc() != null) { - AccountsListAdapter adapter = new AccountsListAdapter(LinphoneManager.getLc().getProxyConfigList()); + AccountsListAdapter adapter = new AccountsListAdapter(); sliderContent.setAdapter(adapter); } } @@ -325,12 +325,10 @@ public class StatusFragment extends Fragment { } class AccountsListAdapter extends BaseAdapter { - private LinphoneProxyConfig[] accounts; private SharedPreferences prefs; private List checkboxes; - AccountsListAdapter(LinphoneProxyConfig[] lpcs) { - accounts = lpcs; + AccountsListAdapter() { prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); checkboxes = new ArrayList(); } @@ -354,7 +352,7 @@ public class StatusFragment extends Fragment { checkBox.setEnabled(false); LinphoneCore lc = LinphoneManager.getLc(); - lc.setDefaultProxyConfig(accounts[selectedPosition]); + lc.setDefaultProxyConfig((LinphoneProxyConfig) getItem(selectedPosition)); if (lc.isNetworkReachable()) { lc.refreshRegisters(); } @@ -363,11 +361,11 @@ public class StatusFragment extends Fragment { }; public int getCount() { - return accounts.length; + return LinphoneManager.getLc().getProxyConfigList().length; } public Object getItem(int position) { - return accounts[position]; + return LinphoneManager.getLc().getProxyConfigList()[position]; } public long getItemId(int position) {