Merge pull request '合并' (#9) from qhh into master1

app/src/main/AndroidManifest.xml

@@ -33,6 +33,8 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
 
     <!-- 允许应用接收系统启动完成的广播 -->
+    <uses-permission android:name="android.permission.SET_ALARM"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
     <!-- 用于在设备启动后重新设置闹钟等任务 -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
@@ -200,6 +202,7 @@
          * 以 singleInstance 模式启动
          * 使用全屏无标题栏主题，确保在锁屏状态下也能显示
          -->
+
         <activity
             android:name=".ui.AlarmAlertActivity"
             android:label="@string/app_name"
@@ -207,6 +210,7 @@
             android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
         </activity>
 
+
         <!--
          * 应用设置偏好活动
          * 提供应用内设置选项（如主题、通知等）

app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java

@@ -54,12 +54,12 @@ public class AlarmInitReceiver extends BroadcastReceiver {
                     Intent sender = new Intent(context, AlarmReceiver.class);
                     sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
                     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
-                    AlarmManager alermManager = (AlarmManager) context
+                    AlarmManager alarmManager = (AlarmManager) context
                             .getSystemService(Context.ALARM_SERVICE);
-                    alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
+                    alarmManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
                 } while (c.moveToNext());
             }
             c.close();
         }
     }
-}
+}

app/src/main/res/values/styles.xml

@@ -62,9 +62,12 @@
         <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>-->
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
+        <item name="android:visibility">visible</item>
-        <item name="android:visibility">gone</item>
     </style>
 </resources>
     <!--<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">-->