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

Fix tablet multiple wizard windows stacked

Browse source
This commit is contained in:
Sylvain Berfini 2013-10-08 15:32:51 +02:00
parent b33f2fc103
commit 1c7fd4e917
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -68,7 +68,7 @@
<activity android:name="org.linphone.LinphoneActivity" <activity android:name="org.linphone.LinphoneActivity"
android:theme="@style/NoTitle" android:theme="@style/NoTitle"
android:screenOrientation="nosensor" android:screenOrientation="behind"
android:launchMode="singleTask"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

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

@ -59,7 +59,6 @@ public class LinphoneLauncherActivity extends Activity {
mHandler = new Handler(); mHandler = new Handler();
if (getResources().getBoolean(R.bool.enable_push_id)) { if (getResources().getBoolean(R.bool.enable_push_id)) {
Compatibility.initPushNotificationService(this); Compatibility.initPushNotificationService(this);
} }

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

@ -109,13 +109,13 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
int id = v.getId(); int id = v.getId();
if (id == R.id.setup_cancel) { if (id == R.id.setup_cancel) {
LinphonePreferences.instance().firstLaunchSuccessful();
if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) { if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
moveTaskToBack(true); moveTaskToBack(true);
} else { } else {
setResult(Activity.RESULT_CANCELED); setResult(Activity.RESULT_CANCELED);
finish(); finish();
} }
LinphonePreferences.instance().firstLaunchSuccessful();
} else if (id == R.id.setup_next) { } else if (id == R.id.setup_next) {
if (firstFragment == SetupFragmentsEnum.LINPHONE_LOGIN) { if (firstFragment == SetupFragmentsEnum.LINPHONE_LOGIN) {
LinphoneLoginFragment linphoneFragment = (LinphoneLoginFragment) fragment; LinphoneLoginFragment linphoneFragment = (LinphoneLoginFragment) fragment;
@ -140,13 +140,13 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (currentFragment == firstFragment) { if (currentFragment == firstFragment) {
LinphonePreferences.instance().firstLaunchSuccessful();
if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) { if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
moveTaskToBack(true); moveTaskToBack(true);
} else { } else {
setResult(Activity.RESULT_CANCELED); setResult(Activity.RESULT_CANCELED);
finish(); finish();
} }
LinphonePreferences.instance().firstLaunchSuccessful();
} }
if (currentFragment == SetupFragmentsEnum.MENU) { if (currentFragment == SetupFragmentsEnum.MENU) {
WelcomeFragment fragment = new WelcomeFragment(); WelcomeFragment fragment = new WelcomeFragment();