Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some issues related to customization options + new custo option to add back exit button on dialer

Browse source
This commit is contained in:
Sylvain Berfini 2013-08-07 09:13:14 +02:00
parent a3044739c3
commit 2946a808f4
7 changed files with 54 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
res/layout-small/status.xml
View file

@ -217,6 +217,19 @@
android:visibility="gone"
android:layout_alignParentRight="true" />
<TextView
android:id="@+id/exit"
android:text="@string/menu_exit"
android:textColor="@android:color/white"
android:textSize="14dp"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_alignParentRight="true"
android:visibility="gone"
android:paddingRight="10dp" />
</RelativeLayout>
</org.linphone.ui.SlidingDrawer>

14
res/layout/status.xml
View file

@ -217,6 +217,20 @@
android:visibility="gone"
android:layout_alignParentRight="true" />
<TextView
android:id="@+id/exit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/menu_exit"
android:textColor="@android:color/white"
android:visibility="gone"
android:textSize="18dp" />
</RelativeLayout>
</org.linphone.ui.SlidingDrawer>

2
res/values/non_localizable_custom.xml
View file

@ -16,6 +16,7 @@
<bool name="replace_settings_by_about">false</bool>
<bool name="replace_chat_by_about">false</bool>
<bool name="display_about_in_settings">true</bool>
<bool name="exit_button_on_dialer">true</bool>
<bool name="hide_camera_settings">false</bool>
<bool name="replace_wizard_with_old_interface">false</bool>
@ -28,6 +29,7 @@
<bool name="hide_generic_accounts_wizard">false</bool>
<bool name="hide_accounts">false</bool>
<bool name="display_account_wizard_at_first_start">true</bool>
<bool name="use_linphone_server_ports">true</bool>
<bool name="use_android_native_contact_edit_interface">false</bool>
<!-- The following settings are only usefull if use_android_native_contact_edit_interface = false -->

1
src/org/linphone/LinphoneActivity.java
View file

@ -1225,7 +1225,6 @@ public class LinphoneActivity extends FragmentActivity implements
}
public void exit() {
refreshStatus(OnlineStatus.Offline);
finish();
stopService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
}

2
src/org/linphone/PreferencesFragment.java
View file

@ -550,6 +550,8 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
LinphoneActivity.instance().selectMenu(FragmentsAvailable.SETTINGS);
}
if (!getResources().getBoolean(R.bool.hide_accounts)) {
createDynamicAccountsPreferences();
}
}
}

19
src/org/linphone/StatusFragment.java
View file

@ -43,6 +43,7 @@ import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@ -60,7 +61,7 @@ import android.widget.Toast;
public class StatusFragment extends Fragment {
private Handler mHandler = new Handler();
private Handler refreshHandler = new Handler();
private TextView statusText;
private TextView statusText, exit;
private ImageView statusLed, callQuality, encryption, background;
private ListView sliderContentAccounts;
private TableLayout callStats;
@ -98,6 +99,19 @@ public class StatusFragment extends Fragment {
sliderContentAccounts = (ListView) view.findViewById(R.id.accounts);
exit = (TextView) view.findViewById(R.id.exit);
exit.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if (LinphoneActivity.isInstanciated()) {
LinphoneActivity.instance().exit();
}
return true;
}
});
if (getResources().getBoolean(R.bool.exit_button_on_dialer))
exit.setVisibility(View.VISIBLE);
// We create it once to not delay the first display
populateSliderContent();
@ -320,6 +334,7 @@ public class StatusFragment extends Fragment {
statusText.setVisibility(View.GONE);
encryption.setVisibility(View.VISIBLE);
exit.setVisibility(View.GONE);
// We are obviously connected
statusLed.setImageResource(R.drawable.led_connected);
@ -328,6 +343,8 @@ public class StatusFragment extends Fragment {
statusText.setVisibility(View.VISIBLE);
background.setVisibility(View.VISIBLE);
encryption.setVisibility(View.GONE);
if (getResources().getBoolean(R.bool.exit_button_on_dialer))
exit.setVisibility(View.VISIBLE);
if (drawer != null && getResources().getBoolean(R.bool.lock_statusbar)) {
drawer.lock();

5
src/org/linphone/setup/SetupActivity.java
View file

@ -112,6 +112,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
moveTaskToBack(true);
} else {
setResult(Activity.RESULT_CANCELED);
finish();
}
} else if (id == R.id.setup_next) {
@ -141,6 +142,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
moveTaskToBack(true);
} else {
setResult(Activity.RESULT_CANCELED);
finish();
}
}
@ -326,7 +328,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
writePreference(R.string.pref_domain_key, domain);
boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain));
if (isMainAccountLinphoneDotOrg) {
boolean useLinphoneDotOrgCustomPorts = getResources().getBoolean(R.bool.use_linphone_server_ports);
if (isMainAccountLinphoneDotOrg && useLinphoneDotOrgCustomPorts) {
if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) {
writePreference(R.string.pref_proxy_key, domain + ":5228");
writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tcp_key));