From 108d3983d13c2c3b141b9bfedd2b59c33f1e87b8 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Tue, 7 Feb 2012 11:45:18 -0500 Subject: [PATCH] Fixed App Icon Navigation by passing the extras passed to Exalted Dice to the settings activity, and back again. Change-Id: I6bd98cdbb6cab3db7233005bd0cd1dc1a7083adb Signed-off-by: Ricky Barrette --- .../src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java | 5 ++--- .../src/com/TwentyCode/android/ExaltedDice/Settings.java | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java index 07e1964..f6dfa6c 100755 --- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java +++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java @@ -178,8 +178,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - Intent intent = new Intent(this, GameListActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + Intent intent = new Intent(this, GameListActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); return true; case MENU_QUIT: @@ -189,7 +188,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic clearHistory(); return true; case SETTINGS: - startActivity(new Intent(this, Settings.class)); + startActivity(new Intent(this, Settings.class).putExtras(getIntent().getExtras())); return true; default: return super.onOptionsItemSelected(item); diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java index 98a5cbb..71072aa 100644 --- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java +++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java @@ -104,8 +104,9 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - Intent intent = new Intent(this, ExaltedDice.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + Intent intent = new Intent(this, ExaltedDice.class) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + .putExtras(getIntent().getExtras()); startActivity(intent); return true; default: