87293 Commits

Author SHA1 Message Date
Irfan Sheriff
31a92447b0 am b312163d: Merge "Fix handling of hidden access points" into jb-mr1-dev
* commit 'b312163dde3f1303822934e735d72f00003d2564':
  Fix handling of hidden access points
2012-10-09 11:14:47 -07:00
Irfan Sheriff
b312163dde Merge "Fix handling of hidden access points" into jb-mr1-dev 2012-10-09 11:11:29 -07:00
Irfan Sheriff
462ff630e4 Fix handling of hidden access points
We now get raw hex data from the supplicant and we convert it into
printable format.

For hidden access point, we always used to return a single empty string.
We need to make sure we maintain that behavior for apps to not start
displaying empty strings.

Bug: 7310749
Change-Id: I2599b9b5e15be91fc34e9af629ad893b1a0357fc
2012-10-09 10:56:47 -07:00
Dirk Dougherty
b0a8b0b816 am 3b9e7f32: am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '3b9e7f32380e179aa1e0718762e86ffa24cbab93':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:41:15 -07:00
Dirk Dougherty
3b9e7f3238 am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit 'fb554fc0bf46b17314df26bdfb683c580b18f214':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:39:06 -07:00
Dirk Dougherty
fb554fc0bf am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit 'b049b1ef81d301359444b6b18671a513373ba221':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:36:43 -07:00
Dirk Dougherty
b049b1ef81 am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:33:53 -07:00
Dirk Dougherty
46c4b4886a Doc change: Subscriptions free trials on Google Play.
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
2012-10-09 10:17:55 -07:00
Amith Yamasani
1ab9ac685b am e8f67ed3: Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev
* commit 'e8f67ed30b60f56718ea58338c7114d5dd14baf0':
  Add an upgrade step for settings moved to global.
2012-10-09 09:43:23 -07:00
Amith Yamasani
e8f67ed30b Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev 2012-10-09 09:40:39 -07:00
Michael Jurka
540720e150 am 7ed267f5: Fix one case where recents is sometimes not visible
* commit '7ed267f53852aa18aacb605297e56f88d7c08333':
  Fix one case where recents is sometimes not visible
2012-10-09 08:30:45 -07:00
Michael Jurka
7ed267f538 Fix one case where recents is sometimes not visible
Bug: 7299653
2012-10-09 17:03:38 +02:00
Satoshi Kataoka
8fa0838bf8 Don't update the text services locale in the main thread
Bug: 6761326
Change-Id: I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
2012-10-09 19:20:27 +09:00
Satoshi Kataoka
255cfabba6 am 6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
* commit '6be35dd636bd530a781e997ea9f9a43fc82a1fef':
  Fix an issue on showInputMethodPickerFromClient
2012-10-09 00:30:13 -07:00
Satoshi Kataoka
6be35dd636 Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 2012-10-09 00:28:17 -07:00
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
2012-10-09 00:05:26 -07:00
Jeff Brown
8f4baad387 Merge "Blank or unblank all displays as need." into jb-mr1-dev 2012-10-09 00:02:46 -07:00
Eino-Ville Talvala
4f8e5ce21d Camera: Query AudioService for shutter sound enforcement.
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
2012-10-08 23:53:48 -07:00
Satoshi Kataoka
c86884cd83 Fix an issue on showInputMethodPickerFromClient
Bug: 7302748
Change-Id: Iff4345d26b3d6e4bfedf893bbd6a864c771df01d
2012-10-09 15:20:29 +09:00
Jim Miller
223ce5c732 Implement music and user priority scheme in keyguard
This fixes an issue where the music transport hangs around indefinitely.
It used to get dismissed when music stopped playing and a notification came in.
This was due to a bug in JB.

Now that the bug is fixed,  the music control hangs around indefinitely until
the application actually releases it.

Since we have widget support, we can now leave the transport control in place
for as long as it's possible to resume music (state = playing | paused).

If music is playing, we start with the trasport showing
If not, and multi-user is enabled for more than one user, we show the user switcher.
Otherwise, we show the clock.

Bug 7290707

Change-Id: I6f0553a64b7b66bac7b35eca6d8a8793c15b918c
2012-10-08 21:48:30 -07:00
Adam Powell
6cccadfb43 am 434f8172: Merge "Don\'t do a wifi p2p scan in MediaRouter if we\'re already connected" into jb-mr1-dev
* commit '434f8172332f0abf02499f33846c6042ed628b0c':
  Don't do a wifi p2p scan in MediaRouter if we're already connected
2012-10-08 21:23:28 -07:00
Adam Powell
434f817233 Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev 2012-10-08 21:20:20 -07:00
Adam Powell
b072a9686c Don't do a wifi p2p scan in MediaRouter if we're already connected
When we're connected to a wifi display already, some configurations
might hiccup or otherwise disrupt the media stream if we initiate a
new scan. Block the MediaRouter's default scanning behavior if we
start up while already connected to a wifi display. (A scan will still
occur if the user opens the picker dialog.)

Change-Id: I413efa883eec41fe0377da18bcb55bc72e2ac729
2012-10-08 20:56:35 -07:00
Winson Chung
1cea2f3d87 Increasing timeout for screenshot chord in keyguard. (Bug 6941775)
Change-Id: Ie846ce18878f9597e9f0cd97d78322b59042d43c
2012-10-08 20:42:31 -07:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need.
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
2012-10-08 19:23:15 -07:00
Christopher Tate
af75948cdd New command line tool: "settings"
Because the usual content provider interface doesn't allow specification of
the target user under which to perform settings reads/writes, this CL introduces
a new command line app specifically for that.

Usage:

   settings [--user num] get namespace key
   settings [--user num] put namespace key value

If a --user argument is not given, the owner user is targetted.

Bug 7299066

Change-Id: I73108bb76b04fad133cc4e0f218d64490de549f1
2012-10-08 18:39:27 -07:00
Brian Colonna
66a65f9c4b am eb7f1571: Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev
* commit 'eb7f1571ae60db17ead3a8879b4b49df306f009d':
  FUL fallback is no longer account login  - fix b/7280196
2012-10-08 17:42:02 -07:00
Brian Colonna
eb7f1571ae Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 2012-10-08 17:39:16 -07:00
Jim Miller
d1c0e98076 am 0c9b5359: Merge "Fix "checking account" string" into jb-mr1-dev
* commit '0c9b5359bd15f74857f6b07931f484aca214abcf':
  Fix "checking account" string
2012-10-08 17:29:23 -07:00
Jim Miller
0c9b5359bd Merge "Fix "checking account" string" into jb-mr1-dev 2012-10-08 17:26:22 -07:00
Chris Wren
a934fd142e default the screen on during the dream.
Bug: 7295909
Change-Id: Ic629bd08bdade8dba2b92124c56cab1bb438bec2
2012-10-08 17:23:36 -07:00
Victoria Lease
b711d57ca4 Multiuser love for LocationManager
LocationManagerService now keeps track of the current user ID and
denies location requests made by all but the foreground user.

Additionally, location settings are now user-specific, rather than
global to the device. Location provider services now run as specific
users, and when the device's foreground user changes, we rebind to
appropriately-owned providers.

Bug: 6926385
Bug: 7247203
Change-Id: I346074959e96e52bcc77eeb188dffe322b690879
2012-10-08 17:19:43 -07:00
Amith Yamasani
531c237b82 Add an upgrade step for settings moved to global.
For some reason, the original step didn't work for some testers. This re-applies the move, which
should be no-ops if the entries are already in the right table.

Bug: 7254629

Also moved a few more entries to the global initialization section. Otherwise they would write
into the wrong table.

Change-Id: Ic0f5c4e09680f5687d08dccf78063508b9c0584c
2012-10-08 17:04:17 -07:00
Jeff Brown
541d8d2c2b am 2aac1a0f: Merge "Improve the power off fade animation." into jb-mr1-dev
* commit '2aac1a0fe8fe5dea1185374ed914f95101de16ed':
  Improve the power off fade animation.
2012-10-08 17:02:30 -07:00
Jeff Brown
2aac1a0fe8 Merge "Improve the power off fade animation." into jb-mr1-dev 2012-10-08 17:00:18 -07:00
Eric Laurent
dd45d01128 enforce camera sound according to country code
Use mcc config overlay mechanism to enforce camera shutter sounds
in countries where it is mandatory.
Property ro.camera.sound.forced is not needed anymore.
When camera sound is forced, STREAM_SYSTEM_ENFORCED is removed from
streams affected by ringer mode and its volume is
maxed out. AudioSystem.FORCE_SYSTEM_ENFORCED is sent to audio
policy manager to alter the routing policy for STREAM_SYSTEM_ENFORCED.

Also fix streams being unmuted when settings are reloaded
upon user switch while in silent mode.

Add ringer mode to audio service dump.

Bug 7032634.

Change-Id: Iceea5bba3b8d3aabf8e42b222deb33a893dc8f38
2012-10-08 17:00:02 -07:00
Robert Ly
1f415fa2ea docs: nfc ndef helper methods bug 5957772
Change-Id: I9c8356f44c1f9cc4a5187d40816cbfdd6212ab6e
2012-10-08 16:59:39 -07:00
Jim Miller
6c5bd361fe Fix "checking account" string
Fixes bug 7309934

Change-Id: Ia665142b8dcd8de424312bd7bf0800d7b871b03b
2012-10-08 16:38:50 -07:00
Jeff Brown
252c206984 Improve the power off fade animation.
Fixes an issue where the dim surface alpha was not actually being
animated like it was supposed to.

Bug: 7224614
Change-Id: Iffd54367ca97ae7fd4b9603807f4e036750442b2
2012-10-08 16:21:01 -07:00
Baligh Uddin
62766897cb am e70bf654: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e70bf65423056c2f336602aa9b3942ea446225e4':
  Import translations. DO NOT MERGE
2012-10-08 15:56:02 -07:00
Baligh Uddin
e70bf65423 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 15:53:43 -07:00
Svetoslav Ganov
bfe01498a9 am 62f1722d: Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev
* commit '62f1722d7c168048952f93045c5f1d06fdab0202':
  Accessibility enhancements within quick settings and notification shade.
2012-10-08 15:53:17 -07:00
Svetoslav Ganov
62f1722d7c Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev 2012-10-08 15:51:15 -07:00
Baligh Uddin
388f157be8 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-08 15:49:58 -07:00
Baligh Uddin
3c576d9b65 Import translations. DO NOT MERGE
Change-Id: Idd93f9399dcd2466e3d6d84bee4b536a8a41b476
Auto-generated-cl: translation import
2012-10-08 15:23:58 -07:00
Baligh Uddin
404615d266 Import translations. DO NOT MERGE
Change-Id: I9059498aed3bca6294e9f93d89709454c04e0997
Auto-generated-cl: translation import
2012-10-08 15:22:19 -07:00
Victoria Lease
c1bb4bfb28 am 0fb7e32a: Merge "Last position improvements for GeofenceManager" into jb-mr1-dev
* commit '0fb7e32a0129e9e62d58ea652cc00f8a908d65b5':
  Last position improvements for GeofenceManager
2012-10-08 15:17:37 -07:00
Victoria Lease
0fb7e32a01 Merge "Last position improvements for GeofenceManager" into jb-mr1-dev 2012-10-08 15:14:49 -07:00
Svetoslav Ganov
b2e330c6c4 am 55c70293: Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev
* commit '55c7029312f67a80c658fa84bd404ef7569d02d8':
  Show the touch explore enable dialog for the current user.
2012-10-08 15:05:08 -07:00
Dianne Hackborn
1b94df8af9 am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev
* commit '4efbab480d7e1b770c5515a76b897359730c1a4d':
  Framework side of issue #7302511: GCM client needs to use new framework API...
2012-10-08 15:05:04 -07:00