1059 Commits

Author SHA1 Message Date
Daniel Sandler
0e9c942e4a am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
* commit '834c2870fa422098b3728ae26099b3030994f86f':
  Quick fix for bug 5646217 blocking automation tests
2011-11-29 05:54:09 -08:00
Daniel Sandler
7d46c613f6 Quick fix for bug 5646217 blocking automation tests
The screen saver knows to avoid running when applications
are holding wake locks via window flags, but other wake
locks are invisible to the window manager and therefore to
the screen saver activation code.

The correct thing to do is move the screen saver to the
power manager to give it access to all wakelock information.
In the meantime, this fix checks for the user's
STAY_ON_WHILE_PLUGGED_IN setting and disables the screen
saver in this case.

Bug: 5646217
Change-Id: Ia2286a8c3745267871901f7a0b7df94ec344a456
2011-11-23 09:03:51 -05:00
Daniel Sandler
5b17f73573 am 70f1279e: am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '70f1279e65eaa138f297a8f590f8383f2c76f7b4':
  Dismiss system windows when screen savers start.
2011-11-22 07:19:02 -08:00
Daniel Sandler
711683cd96 am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
  Dreams (now Screen Candy) development.
2011-11-19 20:48:21 -08:00
Daniel Sandler
6686effc61 am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '2e56995e9e19f18958167a28911120f31b096756':
  Tie screen saver to the screen off timeout.
2011-11-18 14:47:58 -08:00
Jim Miller
76b2337cfa resolved conflicts for merge of 1a783be3 to master
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
2011-11-18 13:56:20 -08:00
Daniel Sandler
5207d9c94b Dismiss system windows when screen savers start.
Also add a couple more flags to the intent:
 - NO_HISTORY (finish activity on suspend)
 - FLAG_FROM_BACKGROUND

Bug: 5578434
Change-Id: I97b965175a27760b819dc29ddb57865c5f4754d6
2011-11-18 09:30:08 -08:00
Daniel Sandler
2d54536d08 Dreams (now Screen Candy) development.
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"

Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
2011-11-18 08:00:04 -08:00
Jim Miller
be3bf963c4 am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit 'a8606cf661fde3300165f181c5825cf0535adc66':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
2011-11-18 02:37:49 -08:00
Daniel Sandler
da0e7b0c7a Merge "Tie screen saver to the screen off timeout." into ics-mr1 2011-11-17 21:02:40 -08:00
Jim Miller
70bded0ab8 Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 2011-11-17 18:58:20 -08:00
Jim Miller
9a3caf39e4 Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
This bug is the result of onPause()/onResume() not being called properly
when we have both lock and unlock screens present, which is true for the SIM
and PUK unlock cases.

The fix is to invoke onPause() and onResume() on both of them if they exist.

Verified the rest of the code correctly handles having both.

Also, when the user cancels, we now clear the fields.

Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
2011-11-17 17:58:40 -08:00
Jim Miller
398f80eacb Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2011-11-17 17:41:50 -08:00
Jim Miller
90d5d46b9e Fix 5620754: don't show pattern screen after SIM PUK unlock
This fixes a bug where we would inadvertently show the pattern
screen after PUK-unlocking the device.  Could potentially happen
after SIM unlock as well, but that path appears to be fast enough that
it's rarely seen.

The cause was not getting the SIM state change before deciding to show
the Unlock screen.

We now immediately invoke the callback if SIM/PUK unlock succeeds without
waiting for the round-trip from the radio layer.

Change-Id: I02dcb456da415b82f30f8e3abc43f788f3931b33
2011-11-17 16:57:01 -08:00
Daniel Sandler
7e37df5d1f Tie screen saver to the screen off timeout.
The window manager now monitors the plug state; the screen
saver will never be automatically started if the device is
running off battery.

Change-Id: Ib1064d9cdd540238957df3ba7020303b0f6943c2
2011-11-17 13:29:01 -08:00
Daniel Sandler
f27e94ce9d am 7fd3ba91: am d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f':
  Disable desk dock apps.
2011-11-17 11:46:21 -08:00
Daniel Sandler
28b23cdef4 am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
2011-11-17 07:48:15 -08:00
Daniel Sandler
d5decdccc6 Merge "Disable desk dock apps." into ics-mr1 2011-11-16 22:33:44 -08:00
Daniel Sandler
f52a4482dd Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
11ddf533a2 Disable desk dock apps.
When a device is attached to a desk dock, the
CATEGORY_DESK_DOCK intent will no longer be fired.
As a side effect, the "dock home" behavior (which captures
the home key for the dock app as long as the device is
docked) is now disabled for desk docks.

Car docks are unchanged.

Bug: 5591015
Change-Id: I7884f655913c31cf53b88cb2e2b371987be27f64
2011-11-16 11:10:03 -08:00
Steven Ross
c753a1865c Not showing facelock when plugging/unplugging fixes 5438524
This will close down or prevent the start of FaceUnlock if
the device is plugged in or unplugged,
unless FaceUnlock is currently active.

Change-Id: I216831964472da47fb24644070d1717dffe1b7f7
2011-11-16 11:15:56 -05:00
Daniel Sandler
c224f76303 Add a default Dreams component.
Currently set to DeskClock's screensaver, but since it's a
(private) string in f/b/c/r/r/values/config.xml any product
could overlay this.

Bug: 5611008
Change-Id: I7a4623c9c667a6cff8ed80ad600a8a4460bfafb7
2011-11-15 22:55:03 -08:00
Jim Miller
057d48147a am 8622fb34: am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '8622fb34769dc257a319ce8e7dab652312d6c049':
  Fix 5581164: Use abbreviated day in lockscreen
2011-11-15 18:25:08 -08:00
Steven Ross
f6cf6de27a Merge "No blackscreen when dialog is showing fixes 5511992" 2011-11-15 17:18:39 -08:00
Jim Miller
34a62348be Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00
Jim Miller
066d088cce am 390811b8: am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '390811b8a4a08703b32d4d36bc6997798b52d341':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.
2011-11-15 14:59:07 -08:00
Jim Miller
b35a21f987 Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1 2011-11-15 14:51:50 -08:00
Jeff Brown
96af5a054d am d3b98329: am d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit 'd3b98329636ad089bb0b14cefa4b49d32e5ec678':
  Override app requested orientation when docked.
2011-11-15 14:51:08 -08:00
Jeff Brown
dec6cf4f30 Override app requested orientation when docked.
Applies to docks, lid switch, HDMI and rotation lock.
We always choose a mode that is compatible with the application's
request, so if in a landscape dock, we might override a request
for seascape but we leave requests for portrait alone.

Bug: 5620454
Change-Id: Ib0c4f60f7f9e3aeafaba9c717233a950fccb8af2
2011-11-15 14:14:02 -08:00
Jeff Brown
bc072da931 POWER key is always a wake key.
This change is useful to ensure that injected POWER key events
always wake the device even if the right policy flags were
not set.

Change-Id: I05b8b35f984f5c9f58b0e9d44bcb6f41a9562fc8
2011-11-15 13:03:11 -08:00
Steven Ross
0a981cf522 No blackscreen when dialog is showing fixes 5511992
When a dialog is activated, we won't show the blackscreen
until after the lockscreen comes back in focus, which occurs
when the dialog closes.
The user may toggle the power button, causing onScreenTurnedOff to
reset mHasOverlay, even though the dialog is still on top of the window.
Thus, the dialog will have a black box behind it without this change.

Change-Id: I6bec7984b88454e9fff22147cbbfc27b9c0a74f2
2011-11-15 15:42:23 -05:00
Jim Miller
e5ae019b8c Fix 5581164: Use abbreviated day in lockscreen
This fixes a problem where the alarm status was forced to scroll on phones
when the date string got too long.  We now abbreviate the day on lock screen.

Change-Id: I99990f1568282c65fb6ed4e78d20bb31b3487a8e
2011-11-14 20:13:50 -08:00
Jim Miller
2fcd63b8cf Fix 5602985: Show "Emergency calls only" when device has no SIM.
Some countries require phones to show "Emergency calls only" when
roaming on a device with no Sim.  This changes causes the phone
to now display the PLMN string on devices that are voice-capable when
the sim is missing.  This depends on the PLMN containing the text
"Emergency calls only" when the radio has connectivity to any carrier.
Otherwise, the PLMN is expected be null or empty which will cause the
device to just show "No SIM card."

Change-Id: I7c1d4624ae67074e2ca40161845ca8bb36031c42
2011-11-14 17:21:55 -08:00
Steven Ross
a4e3fe2276 Merge "Making KeyguardView slippery fixes 5501105" 2011-11-14 16:56:46 -08:00
Jim Miller
6162960c1e am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '3dd5567710168da330741cb4c4263cc03dd942f1':
  Fix 5579440: Add transport control view to tablet unlock screens
2011-11-14 16:21:10 -08:00
Jim Miller
faed16030d Fix 5579440: Add transport control view to tablet unlock screens
This updated tablet layouts to support showing album art and transport
control views in PIN, pattern and password screens of lock screen.

It also allows the addition of a background protect asset and
the ability to show the system wallpaper on layouts that define a
transport_bg_protect view.

Also updated layout to use new ICS-style buttons on lock screen and
fixed bug with "forgot pattern" button where we were showing the
emergency call icon.

To avoid problems with leading ones in the mono-space clock font,
we now right-justify status text on tablet and remove the AM/PM
indicator.

Status font size adjusted by UX.

Added background protection drop shadow to transport control.

Fixed portrait mode to be right-justified when transport is showing.

Change-Id: I790292fc39f4588f87adc9d9241706817ae6baab
2011-11-14 14:09:05 -08:00
Steven Ross
229574c7f5 Making KeyguardView slippery fixes 5501105
Setting the slippery flag keeps this window from processing
events occurring in places where another window is on top of it.
Specifically, if someone clicks above the pattern/FaceUnlock portion
of the window and then drags down onto FUL, this blocks the
underlying lockscreen from processing those touch events.

Change-Id: Ia7038841df0044f66220af8a00c7845b2293c2a4
2011-11-14 15:40:37 -05:00
Dianne Hackborn
4bae1f6602 am 8f45e3e2: am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit '8f45e3e280fa84494d5d45c73697645d20dea101':
  Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
2011-11-11 11:51:21 -08:00
Dianne Hackborn
be425ccea4 Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1 2011-11-11 11:36:14 -08:00
Dianne Hackborn
4eff8d37da Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
Drive the menu button off of the currently focused window.  That is, after all,
the one that is going to receive the menu key event.

Change-Id: I61cac1e274602e5ea53402ab15bd63a9cd89e9cd
2011-11-10 19:38:40 -08:00
Jeff Brown
5a8ce7b2bf am 71ed608e: am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '71ed608ea7cfb349bba06c5f6bb17b525a4fd964':
  Wake on volume key when in dock. Bug: 5580373
2011-11-10 22:50:19 +00:00
Jeff Brown
88089ccc79 Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 2011-11-10 14:40:48 -08:00
Jeff Brown
43150bfa93 Wake on volume key when in dock.
Bug: 5580373

Change-Id: I847fb10b48c2e5e26cabefea1d630793efc32131
2011-11-10 14:33:59 -08:00
Dianne Hackborn
f16cb9e510 am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '8eac3b2f1ae4b155bd159317e9f221223189ba26':
  Fix issue #5470311: Activity with android:configChanges defined...
2011-11-10 22:17:08 +00:00
Dianne Hackborn
0f70e482c8 Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 2011-11-10 14:12:25 -08:00
Dianne Hackborn
56b53b597f Fix issue #5470311: Activity with android:configChanges defined...
...should not be restarted when rotating screen on xoom

This was a side-effect of a previous fix to compute the screen layout
config class based on the actual space available to the application, not
the raw display size.  On a device like Xoom, the system bar causes us
to switch between LONG and NOTLONG depending on whether the system bar
is on the short or long side of the screen.

To fix this, we now compute the screen layout class the same way
"smallest width" is computed: looking at all of the possible rotations
and using the smallest of them all.  In addition to preventing the device
from toggling between long and notlong on a Xoom-like screen, this will
also avoid other possible undersireable behavior like changing screen
layout size when rotating.

This does mean that Xoom is no longer considered a long screen even when
in landscape, because it is not a long screen in portrait.

Change-Id: I85f90a16294ef5a7de94d5b9231abbc6f914fe90
2011-11-10 11:19:57 -08:00
Jim Miller
524a0adeb5 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-10 16:15:14 +00:00
Jim Miller
270826a887 Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 2011-11-09 15:19:31 -08:00
Jeff Brown
97c9e987ba am 0816b0c8: am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit '0816b0c871ea93ffbcd3c60151d067dcfcebc1ac':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
2011-11-09 21:51:25 +00:00
Wei Huang
fc2cc318ba am e64022ca: am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
* commit 'e64022ca65e36c743eca260f05f245fe9d90f80c':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
2011-11-09 21:51:04 +00:00