diff --git a/res/layout/account_management_layout.xml b/res/layout/account_management_layout.xml index bc5611982022b178a736ed55272dcfc44738d507..004b63ed6f0c507ddee430ce0786612746c996fb 100644 --- a/res/layout/account_management_layout.xml +++ b/res/layout/account_management_layout.xml @@ -2,7 +2,7 @@ <!-- Copyright (C) 2004-2012 Savoir-Faire Linux Inc. -Author: Adrien Beraud <adrien.beraud@gmail.com> +Author: Alexandre Savard <alexandre.savard@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/res/layout/pref_management_layout.xml b/res/layout/pref_management_layout.xml new file mode 100644 index 0000000000000000000000000000000000000000..fe12a5a2684f15ce58c1bc7f0916778bf1bc1829 --- /dev/null +++ b/res/layout/pref_management_layout.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (C) 2004-2012 Savoir-Faire Linux Inc. + +Author: Alexandre Savard <alexandre.savard@gmail.com> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Additional permission under GNU GPL version 3 section 7: + +If you modify this program, or any covered work, by linking or +combining it with the OpenSSL project's OpenSSL library (or a +modified version of that library), containing parts covered by the +terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. +grants you additional permission to convey the resulting work. +Corresponding Source for a non-source form of such a combination +shall include the source code for the parts of OpenSSL used as well +as that of the covered work. + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical" + android:gravity="center_horizontal" + android:layout_below="@+id/editTo" + android:id="@+id/prefManagementLayout" + android:weightSum="1.0" + android:paddingLeft="8dp" + android:paddingRight="8dp" > + + <Button + android:id="@+id/buttonCodecUp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:onClick="onClick" + android:text="Codec Up" /> + + <Button + android:id="@+id/buttonCodecDown" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:onClick="onClick" + android:text="Codec Down" /> + +</LinearLayout> diff --git a/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java b/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java index a954cef72e4a772a038ca15c142a7581ee2ac039..cfd1b3501588ac125272731ae1d2e7f86a65f78d 100644 --- a/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java +++ b/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java @@ -34,10 +34,10 @@ package com.savoirfairelinux.sflphone.client; import android.app.Fragment; import android.os.Bundle; import android.util.Log; -import android.widget.Button; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import com.savoirfairelinux.sflphone.R; diff --git a/src/com/savoirfairelinux/sflphone/client/PrefManagementFragment.java b/src/com/savoirfairelinux/sflphone/client/PrefManagementFragment.java new file mode 100644 index 0000000000000000000000000000000000000000..eaa1c07295ade394a2a12cf67a2b9f153d5808c1 --- /dev/null +++ b/src/com/savoirfairelinux/sflphone/client/PrefManagementFragment.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. + * + * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify this program, or any covered work, by linking or + * combining it with the OpenSSL project's OpenSSL library (or a + * modified version of that library), containing parts covered by the + * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. + * grants you additional permission to convey the resulting work. + * Corresponding Source for a non-source form of such a combination + * shall include the source code for the parts of OpenSSL used as well + * as that of the covered work. + */ + +package com.savoirfairelinux.sflphone.client; + +import android.app.Fragment; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + +import com.savoirfairelinux.sflphone.R; + +public class PrefManagementFragment extends Fragment +{ + static final String TAG = "PrefManagementFragment"; + Button buttonCodecUp, buttonCodecDown; + + public PrefManagementFragment() + { + } + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + + Log.i(TAG, "Create Preferences Managerment"); + + buttonCodecUp = (Button) getActivity().findViewById(R.id.buttonCodecUp); + buttonCodecDown = (Button) getActivity().findViewById(R.id.buttonCodecDown); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) + { + Log.i(TAG, "Create Preferences Management View"); + + return inflater.inflate(R.layout.pref_management_layout, parent, false); + } +} diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java b/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java index 93ef560374dc0929798028cf780de2f1ee51e7e7..b3b0d4155f1f6b14c6164c8c9b7516bf4ba8f37c 100644 --- a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java +++ b/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java @@ -130,7 +130,7 @@ public class SFLPhonePreferenceActivity extends Activity implements ActionBar.Ta fragment = new AccountManagementFragment(); break; case 1: - fragment = ArrayListFragment.newInstance(position); + fragment = new PrefManagementFragment(); break; default: Log.i(TAG, "Get new fragment " + position + " is null");