DeskClock.apk backporting for Donut

Signed-off-by: nobunobuta <nobunobuta@nobunobuta.com>

8 files changed, 16 insertions, 9 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 293d0fe9c..95b5503e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,6 @@
 
         <activity android:name="DeskClock"
                 android:label="@string/app_label"
-                android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
                 android:icon="@drawable/ic_widget_analog_clock"
                 android:launchMode="singleInstance"
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation">
@@ -68,7 +67,6 @@
              with the wallpaper background. -->
         <activity android:name="AlarmAlertFullScreen"
                 android:excludeFromRecents="true"
-                android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
                 android:launchMode="singleInstance"
                 android:taskAffinity=""
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation"/>
diff --git a/res/drawable-hdpi/divider_vertical_dark.9.png b/res/drawable-hdpi/divider_vertical_dark.9.png
new file mode 100644
index 000000000..702b8785c
--- /dev/null
+++ b/res/drawable-hdpi/divider_vertical_dark.9.png
diff --git a/res/drawable-hdpi/divider_vertical_dark_opaque.9.png b/res/drawable-hdpi/divider_vertical_dark_opaque.9.png
new file mode 100644
index 000000000..8f35315ae
--- /dev/null
+++ b/res/drawable-hdpi/divider_vertical_dark_opaque.9.png
diff --git a/res/drawable-mdpi/divider_vertical_dark.9.png b/res/drawable-mdpi/divider_vertical_dark.9.png
new file mode 100644
index 000000000..702b8785c
--- /dev/null
+++ b/res/drawable-mdpi/divider_vertical_dark.9.png
diff --git a/res/drawable-mdpi/divider_vertical_dark_opaque.9.png b/res/drawable-mdpi/divider_vertical_dark_opaque.9.png
new file mode 100644
index 000000000..8f35315ae
--- /dev/null
+++ b/res/drawable-mdpi/divider_vertical_dark_opaque.9.png
diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml
index 5c3b19b78..bddb0e3a7 100644
--- a/res/layout/alarm_time.xml
+++ b/res/layout/alarm_time.xml
@@ -51,7 +51,7 @@
     </com.android.deskclock.DontPressWithParentLayout>
 
     <ImageView
-        android:src="@*android:drawable/divider_vertical_dark"
+        android:src="@drawable/divider_vertical_dark"
         android:background="?android:attr/windowBackground"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
diff --git a/src/com/android/deskclock/AlarmAlert.java b/src/com/android/deskclock/AlarmAlert.java
index 3c9b09d3a..29e556000 100644
--- a/src/com/android/deskclock/AlarmAlert.java
+++ b/src/com/android/deskclock/AlarmAlert.java
@@ -77,9 +77,10 @@ public class AlarmAlert extends Activity {
         final boolean requireUnlock = Settings.System.getInt(getContentResolver(), SettingsActivity.KEY_ALARM_REQUIRES_UNLOCK, 0) == 1;
         
         requestWindowFeature(android.view.Window.FEATURE_NO_TITLE);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-                | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+//        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+//                | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+//                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         
         if (!requireUnlock) {
         	getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 4c0217419..29b19a4a7 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -80,6 +80,7 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.Random;
 
+import java.text.SimpleDateFormat;
 /**
  * DeskClock clock view for desk docks.
  */
@@ -253,9 +254,9 @@ public class DeskClock extends Activity {
         if (DEBUG) Log.d(LOG_TAG, (hold ? "hold" : " releas") + "ing wake lock");
         Window win = getWindow();
         WindowManager.LayoutParams winParams = win.getAttributes();
-        winParams.flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+//        winParams.flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
         winParams.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
-        winParams.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
+//        winParams.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
         if (hold)
             winParams.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
         else
@@ -560,7 +561,14 @@ public class DeskClock extends Activity {
 
         // reload the date format in case the user has changed settings
         // recently
-        mDateFormat = getString(com.android.internal.R.string.full_wday_month_day_no_year);
+//      mDateFormat = getString(com.android.internal.R.string.full_wday_month_day_no_year);
+
+        final SimpleDateFormat dateFormat 
+    		 = (SimpleDateFormat)java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL);
+        mDateFormat = dateFormat.toPattern()
+                .replace("MMMM", "MMM")    // we want "Sep", not "September"
+                .replace("EEEE", "EEE")     // we want "Fri", no "Friday"
+                .replaceAll("EEE$", "(EEE)");
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_DATE_CHANGED);