GitLab

Bug: 2449914

Bug: 2440197

The user most likely wants the alarm to fire at the time they just set so
disable the snooze alert.

Bug: 2421068

(Change 3b5a3c1a caused the widget icon to show up in
Launcher.)

Change-Id: I10b7c73dfed00e74bcf74db0eb4632b23b30dc31

Merge commit '92c9a6fe'

* commit '92c9a6fe':
  android-2.1_r1 snapshot

Merge commit '5553de61' into eclair-plus-aosp

* commit '5553de61':
  android-2.1_r1 snapshot

Bug 2291064

Bug: 2252631

Use ALLOW_LOCK_WHILE_SCREEN_ON window manager flag to allow lockscreen to activate while screen is on.

Change-Id: I302d65c51cd5b6bd495b24479a9c377e4bedf66d
Signed-off-by: Mike Lockwood <lockwood@android.com>

Merge commit '352926aa'

* commit '352926aa':
  empty initial commit

This change allows the user to create a new alarm and then press "Revert"
without having already created the alarm.

Refactor a few methods to take an Alarm object rather than all the alarm fields.
The static method in AlarmClock to create a new alarm is no longer needed. Do
some cleanup in AlarmProvider around intial values.

Bug: 2338234

These were localized in the framework strings but the localized versions
were lost when the application was unbundled.

Bug 2394398

Merge commit 'a03ab881'

* commit 'a03ab881':
  Re-schedule screen saver mode when returning to normal.

Merge commit '6ecdeccc' into eclair-plus-aosp

* commit '6ecdeccc':
  Add translations for Dock Settings menu item.

- Copy some framework resources into the app.
- Add a new layout to SetAlarm to avoid using an internal id to obtain the
  content view.
- Use a string literal to identify the ALARM_CHANGED intent. This is not ideal
  but is better than exposing the actual intent string for now.

Merge commit '9fa4cc96' into eclair-plus-aosp

* commit '9fa4cc96':
  Add Dock Settings menu item to DeskClock.

BUG: 2329568
Signed-off-by: Mike Lockwood <lockwood@android.com>

Bug: 2367275

Merge commit '6e371787' into eclair-plus-aosp

* commit '6e371787':
  Re-schedule screen saver mode when returning to normal.

Merge commit '3866899a' into eclair-plus-aosp

* commit '3866899a':
  Fix http://b/2326879 (drawing glitches)

Fixes http://b/2317620

Introduced in change I35b0967
but accidentally reverted in change Ic98ba511.

 - Attentuate the background slightly more when in dim mode
 - Implement http://b/2332431 (tapping anywhere will cause
   the screen to un-dim)
 - Fix http://b/2349550 (keep the screen dim underneath an
   alarm dialog)
 - When the trackball is operated, focus the alarms button
   first (instead of the dim button)

Merge commit '60d04edf'

* commit '60d04edf':
  Refresh date display at midnight.