wangtao
/
Notes
mirror of https://github.com/MiCode/Notes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 09c6a74e9b into 81a66024fe

This commit is contained in:
GitHub Merge Button 2012-05-12 18:23:21 -07:00
parent 81a66024fe 09c6a74e9b
commit 5cbdebc02c
5 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@ -41,7 +41,6 @@
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustPan" >
<intent-filter>
@ -135,7 +134,7 @@
android:name="net.micode.notes.ui.NotesPreferenceActivity"
android:label="@string/preferences_title"
android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" >
android:theme="@android:style/Theme.Holo" >
</activity>
<service

4
res/layout/note_edit.xml
View File

@ -97,7 +97,9 @@
android:linksClickable="false"
android:minLines="12"
android:textAppearance="@style/TextAppearancePrimaryItem"
android:lineSpacingMultiplier="1.2" />
android:lineSpacingMultiplier="1.2"
android:textColor="#000000"
android:textCursorDrawable="@null"/>
<LinearLayout
android:id="@+id/note_edit_list"

7
res/values/styles.xml
View File

@ -58,12 +58,11 @@
<item name="android:textColor">@color/secondary_text_dark</item>
</style>
<style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
<style name="NoteTheme" parent="@android:style/Theme.Holo">
<item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
</style>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions" />
<item name="android:visibility">gone</item>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.ActionBar.Solid">
<item name="android:displayOptions">showHome|useLogo</item>
</style>
</resources>

16
src/net/micode/notes/ui/NoteEditActivity.java
View File

@ -16,11 +16,7 @@
package net.micode.notes.ui;
import android.app.Activity;
import android.app.AlarmManager;
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.app.SearchManager;
import android.app.*;
import android.appwidget.AppWidgetManager;
import android.content.ContentUris;
import android.content.Context;
@ -395,6 +391,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
}
mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
ActionBar actionBar = getActionBar();
actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
}
@Override
@ -547,6 +547,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
case R.id.menu_delete_remind:
mWorkingNote.setAlertDate(0, false);
break;
case android.R.id.home:
//finish();
Intent intent = new Intent(this, NotesListActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
break;
default:
break;
}

19
src/net/micode/notes/ui/NotesListActivity.java
View File

@ -16,6 +16,7 @@
package net.micode.notes.ui;
import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@ -555,6 +556,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mTitleBar.setText(data.getSnippet());
}
mTitleBar.setVisibility(View.VISIBLE);
ActionBar actionBar = getActionBar();
actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
}
public void onClick(View v) {
@ -672,12 +677,23 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mState = ListEditState.NOTE_LIST;
startAsyncNotesListQuery();
mTitleBar.setVisibility(View.GONE);
{
ActionBar actionBar = getActionBar();
actionBar.setHomeButtonEnabled(false);
actionBar.setDisplayHomeAsUpEnabled(false);
}
break;
case CALL_RECORD_FOLDER:
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
mAddNewNote.setVisibility(View.VISIBLE);
mTitleBar.setVisibility(View.GONE);
{
ActionBar actionBar = getActionBar();
actionBar.setHomeButtonEnabled(false);
actionBar.setDisplayHomeAsUpEnabled(false);
}
startAsyncNotesListQuery();
break;
case NOTE_LIST:
@ -812,6 +828,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
case R.id.menu_search:
onSearchRequested();
break;
case android.R.id.home:
onBackPressed();
break;
default:
break;
}