1064 Commits

Author SHA1 Message Date
Daniel Sandler
2a40d0d92b Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 2011-12-01 06:29:53 -08:00
Dianne Hackborn
aaddc3b359 am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1
* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192
2011-11-30 20:51:00 -08:00
Dianne Hackborn
e0f085d4b8 Fix issue #5433192 and maybe #5433192
5433192: Factory reset device: compatibility screen is the first...
...screen before setup wizard

Don't show compat mode dialog if compat mode is unknown (which happens
early in boot before an activity is shown for example).  Also make sure
to update status any time the current focus app token changes, so we
correctly update every time switching apps.

5651152 [Stingray] change zoom/strech setting icon won't go away

This is probably also fixed by updating when the app token changes.

Change-Id: Ibe9bd6277166230d5d96689741b78325ea099d57
2011-11-30 18:41:15 -08:00
Amith Yamasani
2b0acc90ae No clicking on volume icon in volume dialog.
Don't disable volume slider when it hits zero.
Show correct icon for Silent mode in Power menu.

Bug: 5586083
Change-Id: Iaa957fc08e314e0de1c007dfc967a1d960080aab
2011-11-30 15:28:43 -08:00
Daniel Sandler
d2b22a885a Put screensavers back in the icebox for now. DO NOT MERGE.
Bug: 5689684
Change-Id: I3a5291c3520bb43e35d55714f1522e4ae7f6e63c
2011-11-30 15:47:36 -05:00
Jeff Brown
d4b1c4424d resolved conflicts for merge of be6ab576 to ics-aah
Change-Id: I87c5679c46a58e233da30e73f068bed2af627ab3
2011-11-29 14:10:46 -08:00
Jeff Brown
be6ab576ff Merge "Fix application launch shortcuts." into ics-mr1 2011-11-29 13:13:33 -08:00
Dianne Hackborn
d9c1e6d966 am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
* commit '50b2042502bc459b40430fe3b3b83d7d61e5daf9':
  Another attempt at getting OOM reports to batch.
2011-11-29 13:08:52 -08:00
Dianne Hackborn
50b2042502 Merge "Another attempt at getting OOM reports to batch." into ics-mr1 2011-11-29 13:05:26 -08:00
Dianne Hackborn
672342c309 Another attempt at getting OOM reports to batch.
We now generate a stack-trace looking thing at the top of the report.

Also fix a bug I hit where the phone window manager was sending a
broadcast before the boot had completed.

Change-Id: I0cee16180e4d05c9bd3fe715212a28f504ec91ac
2011-11-29 12:55:50 -08:00
Jeff Brown
6651a63834 Fix application launch shortcuts.
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.

Added a set of Intent categories for typical applications on the
platform.

Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys.  Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos.  The goal is to encourage them
to stop doing this by implementing more of HID.

Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
2011-11-29 12:17:22 -08:00
Daniel Sandler
3deb24e19a am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
* commit 'fed7a99a5294856d930e18225898828bd6755be1':
  Quick fix for bug 5646217 blocking automation tests
2011-11-29 05:51:13 -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
3d112461d2 am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.
2011-11-22 07:17:19 -08:00
Daniel Sandler
75d8eb2a81 am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
2011-11-19 20:44:36 -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
Daniel Sandler
cbb2f06947 am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
  Tie screen saver to the screen off timeout.
2011-11-17 21:04:35 -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
1a5163dbc5 am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
* commit '70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
2011-11-17 18:59: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
bf4b374256 am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
2011-11-17 17:45:19 -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
6a6d1b9444 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.
2011-11-16 22:35:29 -08:00
Daniel Sandler
d5decdccc6 Merge "Disable desk dock apps." into ics-mr1 2011-11-16 22:33:44 -08:00
Daniel Sandler
83ae021c5d am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
2011-11-16 17:16:57 -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
Mike Lockwood
47a0a8832f Merge "AudioManager: Add support for master mute" into ics-aah 2011-11-16 07:41:21 -08: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
b96a45e0d2 am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '34a62348be92034a9fb7582e51754224785568dc':
  Fix 5581164: Use abbreviated day in lockscreen
2011-11-15 15:44:21 -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
42928f8476 am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit 'b35a21f987b99cfe90f4c46e0a708703274b8f46':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.
2011-11-15 14:54:54 -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
09ab6aa2d2 am d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit 'd5713179a0f68aa47a8cd966abc5324d43414b63':
  Override app requested orientation when docked.
2011-11-15 14:47:47 -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
Mike Lockwood
cfbcd3bf21 AudioManager: Add support for master mute
Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-15 09:57:33 -08: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
Jim Miller
00a4ac1d43 am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
  Fix 5579440: Add transport control view to tablet unlock screens
2011-11-14 16:16:41 -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
Dianne Hackborn
1d72d3276a am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit 'be425ccea47c13d3f8f3d877fdbdcb3c074f7e8b':
  Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
2011-11-11 11:50:49 -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
71cb2044f4 am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
  Wake on volume key when in dock. Bug: 5580373
2011-11-10 22:49:11 +00:00
Dianne Hackborn
e5249ecbf4 am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '0f70e482c8aa7ce9c5676b1226ff98b63fb991e7':
  Fix issue #5470311: Activity with android:configChanges defined...
2011-11-10 22:49:02 +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