am 5595acbe: Merge change Ice325f3b into eclair-mr2

Merge commit '5595acbed8ca1778a61881a00d7baaffecb2a64c' into eclair-mr2-plus-aosp

* commit '5595acbed8ca1778a61881a00d7baaffecb2a64c':
  Fix Notepadv3Solution orientation changes during NoteEdit
This commit is contained in:
Tom O'Neill
2009-12-14 15:24:09 -08:00
committed by Android Git Automerger

View File

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