Merge change Ice325f3b into eclair-mr2

* changes:
  Fix Notepadv3Solution orientation changes during NoteEdit
This commit is contained in:
Android (Google) Code Review
2009-12-14 11:50:14 -08:00

View File

@@ -43,8 +43,8 @@ public class NoteEdit extends Activity {
Button confirmButton = (Button) findViewById(R.id.confirm); Button confirmButton = (Button) findViewById(R.id.confirm);
mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) mRowId = (savedInstanceState == null) ? null :
: null; (Long) savedInstanceState.getSerializable(NotesDbAdapter.KEY_ROWID);
if (mRowId == null) { if (mRowId == null) {
Bundle extras = getIntent().getExtras(); Bundle extras = getIntent().getExtras();
mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID)
@@ -77,7 +77,8 @@ public class NoteEdit extends Activity {
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId); saveState();
outState.putSerializable(NotesDbAdapter.KEY_ROWID, mRowId);
} }
@Override @Override