LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new task starting in samples am: e5d940bda0 am: 753b1b92a7

Browse Source 
am: 1e049ba88d

* commit '1e049ba88d7853f8cafd08292b4e7f251968a5ac':
  Fix new task starting in samples

Change-Id: I6324a4826737095e566ea1554a27757b398cc05e
This commit is contained in:
Andrii Kulian
2016-06-03 02:21:32 +00:00
committed by android-build-merger
parent d8dc5ef63b 1e049ba88d
commit 05357c8e01
3 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
samples/MultiWindow/src/com/example/android/multiwindow/LaunchingAdjacentActivity.java
View File

@@ -34,7 +34,8 @@ public class LaunchingAdjacentActivity extends Activity implements View.OnClickL
super.onCreate(savedInstanceState);
setContentView(R.layout.launching_adjacent_layout);
findViewById(R.id.launch_settings_adjacent).setOnClickListener(this);
findViewById(R.id.launch_new_task).setOnClickListener(this);
findViewById(R.id.launch_new_task_single).setOnClickListener(this);
findViewById(R.id.launch_new_task_multiple).setOnClickListener(this);
findViewById(R.id.launch_new_task_adjacent).setOnClickListener(this);
if (savedInstanceState != null) {
mInstanceNumber = savedInstanceState.getInt(INSTANCE_NUMBER_KEY);
@@ -47,22 +48,43 @@ public class LaunchingAdjacentActivity extends Activity implements View.OnClickL
@Override
public void onClick(View v) {
if (v.getId() == R.id.launch_settings_adjacent) {
Intent intent = new Intent("android.settings.SETTINGS");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
startActivity(intent);
} else if (v.getId() == R.id.launch_new_task) {
Intent intent = new Intent(this, LaunchingAdjacentActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
} else if (v.getId() == R.id.launch_new_task_adjacent) {
Intent intent = new Intent(this, LaunchingAdjacentActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
| Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
startActivity(intent);
switch (v.getId()) {
case R.id.launch_settings_adjacent: {
Intent intent = new Intent("android.settings.SETTINGS");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
startActivity(intent);
}
break;
case R.id.launch_new_task_single: {
Intent intent = newAdjacentActivityIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
break;
case R.id.launch_new_task_multiple: {
Intent intent = newAdjacentActivityIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
startActivity(intent);
}
break;
case R.id.launch_new_task_adjacent: {
Intent intent = newAdjacentActivityIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
| Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
startActivity(intent);
}
break;
}
}
private Intent newAdjacentActivityIntent() {
Intent intent = new Intent(this, LaunchingAdjacentActivity.class);
intent.setAction(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_LAUNCHER);
return intent;
}
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
savedInstanceState.putInt(INSTANCE_NUMBER_KEY, mInstanceNumber);