Compare commits

..

No commits in common. 'master' and 'shj' have entirely different histories.
master ... shj

@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="#88555555" />
<item android:state_selected="true" android:color="#ff999999" /> //测试提交
<item android:state_selected="true" android:color="#ff999999" />
<item android:color="#ff000000" />
</selector>

@ -20,5 +20,4 @@
<item>短信</item>
<item>邮件</item>
</string-array>
</resources>
//测试提交
</resources>

@ -20,5 +20,4 @@
<item>短信</item>
<item>郵件</item>
</string-array>
</resources>
//测试提交
</resources>

@ -25,4 +25,3 @@
android:searchSuggestIntentAction="android.intent.action.VIEW"
android:searchSettingsDescription="@string/search_setting_description"
android:includeInGlobalSearch="true" />
//测试提交

@ -18,11 +18,11 @@ package net.micode.notes.data;
import android.net.Uri;
public class Notes {
public static final String AUTHORITY = "micode_notes";//注释提交测试
public static final String TAG = "Notes"; //注释提交测试
public static final int TYPE_NOTE = 0; //注释提交测试
public static final int TYPE_FOLDER = 1; //注释提交测试
public static final int TYPE_SYSTEM = 2; //注释提交测试
public static final String AUTHORITY = "micode_notes";
public static final String TAG = "Notes";
public static final int TYPE_NOTE = 0;
public static final int TYPE_FOLDER = 1;
public static final int TYPE_SYSTEM = 2;
/**
* Following IDs are system folders' identifiers
@ -30,10 +30,10 @@ public class Notes {
* {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
* {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
*/
public static final int ID_ROOT_FOLDER = 0;//注释提交测试
public static final int ID_TEMPARAY_FOLDER = -1;//注释提交测试
public static final int ID_CALL_RECORD_FOLDER = -2;//注释提交测试
public static final int ID_TRASH_FOLER = -3;//注释提交测试
public static final int ID_ROOT_FOLDER = 0;
public static final int ID_TEMPARAY_FOLDER = -1;
public static final int ID_CALL_RECORD_FOLDER = -2;
public static final int ID_TRASH_FOLER = -3;
public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";

@ -181,7 +181,7 @@ public class DataUtils {
return exist;
}
public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
" AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +

@ -43,12 +43,12 @@ import java.io.IOException;
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
private long mNoteId;
private String mSnippet;
private static final int SNIPPET_PREW_MAX_LEN = 60;//333
private static final int SNIPPET_PREW_MAX_LEN = 60;
MediaPlayer mPlayer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);//22
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
final Window win = getWindow();

Loading…
Cancel
Save