OSDN Git Service
Jeff Brown [Tue, 9 Oct 2012 23:54:26 +0000 (16:54 -0700)]
am
637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev
* commit '
637a30fde7d1754f8b8a76c08326e1c432ffd93d':
Fix a segfault when there is no power module.
Jeff Brown [Tue, 9 Oct 2012 23:51:49 +0000 (16:51 -0700)]
Merge "Fix a segfault when there is no power module." into jb-mr1-dev
Irfan Sheriff [Tue, 9 Oct 2012 23:33:54 +0000 (16:33 -0700)]
am
79dc154a: Merge "Disable poor network avoidance by default" into jb-mr1-dev
* commit '
79dc154afeece0db6ef602c70a34dd69bada03dc':
Disable poor network avoidance by default
Irfan Sheriff [Tue, 9 Oct 2012 23:31:02 +0000 (16:31 -0700)]
Merge "Disable poor network avoidance by default" into jb-mr1-dev
Christopher Tate [Tue, 9 Oct 2012 23:09:39 +0000 (16:09 -0700)]
am
b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev
* commit '
b30a8568a8b31578b10af948869558ae218d0d5c':
Defer wifi bounce following restore for 1 minute...
Christopher Tate [Tue, 9 Oct 2012 23:05:03 +0000 (16:05 -0700)]
Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev
Christopher Tate [Tue, 9 Oct 2012 23:01:59 +0000 (16:01 -0700)]
am
c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev
* commit '
c9c47f821af22c6fae4c97fe185c6a651a6f9b67':
Back up / restore the "Avoid poor connections" wifi setting
Christopher Tate [Tue, 9 Oct 2012 22:57:06 +0000 (15:57 -0700)]
Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev
Irfan Sheriff [Tue, 9 Oct 2012 22:49:33 +0000 (15:49 -0700)]
Disable poor network avoidance by default
Bug:
7318044
Change-Id: Icf27e823453eeaba901aad6f3f8eedea242794f9
Christopher Tate [Tue, 9 Oct 2012 22:26:30 +0000 (15:26 -0700)]
Back up / restore the "Avoid poor connections" wifi setting
Bug
7318177
Change-Id: I8fdc037f823b8c57727e7d49c5bffdc9b3c10ebb
Kenny Root [Tue, 9 Oct 2012 22:23:58 +0000 (15:23 -0700)]
am
a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev
* commit '
a8a6b0848d1c11c3ed0fcb846e3d6c39b91536a0':
Add fused location provider to real provider list
Eino-Ville Talvala [Tue, 9 Oct 2012 22:23:54 +0000 (15:23 -0700)]
am
cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev
* commit '
cbdb21364653910179da1eddd43f4b932420b75b':
Camera: Query AudioService for shutter sound enforcement.
Kenny Root [Tue, 9 Oct 2012 22:21:25 +0000 (15:21 -0700)]
Merge "Add fused location provider to real provider list" into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 22:19:03 +0000 (15:19 -0700)]
Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev
Jim Miller [Tue, 9 Oct 2012 22:15:13 +0000 (15:15 -0700)]
am
74bc9b68: Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev
* commit '
74bc9b68510d8e88fb1c806313aad3f35543202b':
Implement music and user priority scheme in keyguard
Jim Miller [Tue, 9 Oct 2012 22:12:43 +0000 (15:12 -0700)]
Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev
Christopher Tate [Tue, 9 Oct 2012 21:06:30 +0000 (14:06 -0700)]
Defer wifi bounce following restore for 1 minute...
...to allow network-reliant restore actions by apps to get underway.
Bug
7304761
Change-Id: Ia1d2321ef86609588efbc7add043c24a12ec6a20
Jeff Brown [Tue, 9 Oct 2012 21:47:05 +0000 (14:47 -0700)]
Fix a segfault when there is no power module.
This can happen in the emulator.
Bug:
7315152
Change-Id: I4a3f547127419fcd4dc4fc1c6f7ee869706cf12e
rich cannings [Tue, 9 Oct 2012 21:13:13 +0000 (14:13 -0700)]
am
f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev
* commit '
f1b246ddfed6757180768eea080b80c1538333f3':
Fix verfication bypassed for adb installs
rich cannings [Tue, 9 Oct 2012 21:11:21 +0000 (14:11 -0700)]
Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev
rich cannings [Tue, 9 Oct 2012 18:50:15 +0000 (11:50 -0700)]
Fix verfication bypassed for adb installs
ADB installs appear as UserHandle.USER_ALL, and can only be performed by
UserHandle.USER_OWNER, so use the package verifier for UserHandle.USER_OWNER.
This returns a valid userId to call PackageManagerService.getPackageUid.
Bug:
7293091
Change-Id: I7a5497cfe5fa2e7aa804345cf9f507ec26a0db21
Robert Greenwalt [Tue, 9 Oct 2012 20:30:49 +0000 (13:30 -0700)]
am
64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev
* commit '
64cb35c078d58d9025d2f14b3674ca59f2e6d80b':
Add config resource to help ATT prepaid
Robert Greenwalt [Tue, 9 Oct 2012 20:27:18 +0000 (13:27 -0700)]
Merge "Add config resource to help ATT prepaid" into jb-mr1-dev
Adam Powell [Tue, 9 Oct 2012 20:27:42 +0000 (13:27 -0700)]
am
16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev
* commit '
160621280d7eaba7eeddc183c4c11aa49d32e30e':
Allow more scaling values to be tuned in resource overlays
Adam Powell [Tue, 9 Oct 2012 20:25:12 +0000 (13:25 -0700)]
Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev
Kenny Root [Tue, 9 Oct 2012 19:44:40 +0000 (12:44 -0700)]
Add fused location provider to real provider list
During testing it's possible to mock a location provider, but the fused
location provider wasn't being inserted into the "mRealProviders" map so
when the fused location provider was unmocked, it would disappear
permanently from the list until the next reboot.
Bug:
6949478
Change-Id: I4993aa7fbbd21cea16bdbf2722d637c909b1cd73
Victoria Lease [Tue, 9 Oct 2012 19:24:42 +0000 (12:24 -0700)]
am
c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev
* commit '
c0c0c0e612e1ccf1e55eb2a9338ddfff40d8d7f2':
Multiuser love for LocationManager
Victoria Lease [Tue, 9 Oct 2012 19:22:02 +0000 (12:22 -0700)]
Merge "Multiuser love for LocationManager" into jb-mr1-dev
Winson Chung [Tue, 9 Oct 2012 19:20:35 +0000 (12:20 -0700)]
am
e45c4e42: Merge "Increasing timeout for screenshot chord in keyguard. (Bug
6941775)" into jb-mr1-dev
* commit '
e45c4e42d26f13d2e405d1d87a665f5796cd1b6d':
Increasing timeout for screenshot chord in keyguard. (Bug
6941775)
Robert Greenwalt [Mon, 8 Oct 2012 17:13:10 +0000 (10:13 -0700)]
Add config resource to help ATT prepaid
bug:
7306353
Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
Winson Chung [Tue, 9 Oct 2012 19:18:02 +0000 (12:18 -0700)]
Merge "Increasing timeout for screenshot chord in keyguard. (Bug
6941775)" into jb-mr1-dev
Christopher Tate [Tue, 9 Oct 2012 18:46:28 +0000 (11:46 -0700)]
am
af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev
* commit '
af3cd21b08dd22d6ffd747c6314fd49fed3170a0':
New command line tool: "settings"
Robert Ly [Tue, 9 Oct 2012 18:44:49 +0000 (11:44 -0700)]
am
0f31450f: am
fba8b7f5: am
f19e4b42: Merge "docs: nfc ndef helper methods bug
5957772" into jb-dev
* commit '
0f31450fe059f4557ac285ea4ec0cd5122422ea1':
docs: nfc ndef helper methods bug
5957772
Christopher Tate [Tue, 9 Oct 2012 18:43:56 +0000 (11:43 -0700)]
Merge "New command line tool: "settings"" into jb-mr1-dev
Robert Ly [Tue, 9 Oct 2012 18:42:14 +0000 (11:42 -0700)]
am
fba8b7f5: am
f19e4b42: Merge "docs: nfc ndef helper methods bug
5957772" into jb-dev
* commit '
fba8b7f5963cb2bc15f06d83d986345978cc415e':
docs: nfc ndef helper methods bug
5957772
Robert Ly [Tue, 9 Oct 2012 18:40:34 +0000 (11:40 -0700)]
am
f19e4b42: Merge "docs: nfc ndef helper methods bug
5957772" into jb-dev
* commit '
f19e4b420de65306f09c199829e7e06fe210e21d':
docs: nfc ndef helper methods bug
5957772
Robert Ly [Tue, 9 Oct 2012 18:38:00 +0000 (11:38 -0700)]
Merge "docs: nfc ndef helper methods bug
5957772" into jb-dev
Eric Laurent [Tue, 9 Oct 2012 18:32:36 +0000 (11:32 -0700)]
am
14dfe4e0: Merge "enforce camera sound according to country code" into jb-mr1-dev
* commit '
14dfe4e0abe21782236af987f39d01dfb38e6ff3':
enforce camera sound according to country code
Eric Laurent [Tue, 9 Oct 2012 18:29:11 +0000 (11:29 -0700)]
Merge "enforce camera sound according to country code" into jb-mr1-dev
Adam Powell [Tue, 9 Oct 2012 18:20:39 +0000 (11:20 -0700)]
Allow more scaling values to be tuned in resource overlays
Bug
7267507
Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
Irfan Sheriff [Tue, 9 Oct 2012 18:14:47 +0000 (11:14 -0700)]
am
b312163d: Merge "Fix handling of hidden access points" into jb-mr1-dev
* commit '
b312163dde3f1303822934e735d72f00003d2564':
Fix handling of hidden access points
Irfan Sheriff [Tue, 9 Oct 2012 18:11:29 +0000 (11:11 -0700)]
Merge "Fix handling of hidden access points" into jb-mr1-dev
Irfan Sheriff [Tue, 9 Oct 2012 17:52:57 +0000 (10:52 -0700)]
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
Dirk Dougherty [Tue, 9 Oct 2012 17:41:15 +0000 (10:41 -0700)]
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.
Dirk Dougherty [Tue, 9 Oct 2012 17:39:06 +0000 (10:39 -0700)]
am
fb554fc0: am
b049b1ef: am
46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '
fb554fc0bf46b17314df26bdfb683c580b18f214':
Doc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Tue, 9 Oct 2012 17:36:43 +0000 (10:36 -0700)]
am
b049b1ef: am
46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '
b049b1ef81d301359444b6b18671a513373ba221':
Doc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Tue, 9 Oct 2012 17:33:53 +0000 (10:33 -0700)]
am
46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '
46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
Doc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Sun, 7 Oct 2012 22:05:07 +0000 (15:05 -0700)]
Doc change: Subscriptions free trials on Google Play.
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
Amith Yamasani [Tue, 9 Oct 2012 16:43:23 +0000 (09:43 -0700)]
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.
Amith Yamasani [Tue, 9 Oct 2012 16:40:39 +0000 (09:40 -0700)]
Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev
Michael Jurka [Tue, 9 Oct 2012 15:30:45 +0000 (08:30 -0700)]
am
7ed267f5: Fix one case where recents is sometimes not visible
* commit '
7ed267f53852aa18aacb605297e56f88d7c08333':
Fix one case where recents is sometimes not visible
Michael Jurka [Tue, 9 Oct 2012 15:03:30 +0000 (17:03 +0200)]
Fix one case where recents is sometimes not visible
Bug:
7299653
Satoshi Kataoka [Tue, 9 Oct 2012 07:30:13 +0000 (00:30 -0700)]
am
6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
* commit '
6be35dd636bd530a781e997ea9f9a43fc82a1fef':
Fix an issue on showInputMethodPickerFromClient
Satoshi Kataoka [Tue, 9 Oct 2012 07:28:16 +0000 (00:28 -0700)]
Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
Jeff Brown [Tue, 9 Oct 2012 07:05:26 +0000 (00:05 -0700)]
am
8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
* commit '
8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
Blank or unblank all displays as need.
Jeff Brown [Tue, 9 Oct 2012 07:02:46 +0000 (00:02 -0700)]
Merge "Blank or unblank all displays as need." into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 01:16:35 +0000 (18:16 -0700)]
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
Satoshi Kataoka [Tue, 9 Oct 2012 06:20:29 +0000 (15:20 +0900)]
Fix an issue on showInputMethodPickerFromClient
Bug:
7302748
Change-Id: Iff4345d26b3d6e4bfedf893bbd6a864c771df01d
Jim Miller [Sat, 6 Oct 2012 02:13:23 +0000 (19:13 -0700)]
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
Adam Powell [Tue, 9 Oct 2012 04:23:28 +0000 (21:23 -0700)]
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
Adam Powell [Tue, 9 Oct 2012 04:20:20 +0000 (21:20 -0700)]
Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev
Adam Powell [Tue, 9 Oct 2012 03:54:55 +0000 (20:54 -0700)]
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
Winson Chung [Tue, 9 Oct 2012 03:42:01 +0000 (20:42 -0700)]
Increasing timeout for screenshot chord in keyguard. (Bug
6941775)
Change-Id: Ie846ce18878f9597e9f0cd97d78322b59042d43c
Jeff Brown [Tue, 9 Oct 2012 02:17:06 +0000 (19:17 -0700)]
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
Christopher Tate [Mon, 8 Oct 2012 21:56:52 +0000 (14:56 -0700)]
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
Brian Colonna [Tue, 9 Oct 2012 00:42:02 +0000 (17:42 -0700)]
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
Brian Colonna [Tue, 9 Oct 2012 00:39:15 +0000 (17:39 -0700)]
Merge "FUL fallback is no longer account login - fix b/
7280196" into jb-mr1-dev
Jim Miller [Tue, 9 Oct 2012 00:29:23 +0000 (17:29 -0700)]
am
0c9b5359: Merge "Fix "checking account" string" into jb-mr1-dev
* commit '
0c9b5359bd15f74857f6b07931f484aca214abcf':
Fix "checking account" string
Jim Miller [Tue, 9 Oct 2012 00:26:21 +0000 (17:26 -0700)]
Merge "Fix "checking account" string" into jb-mr1-dev
Victoria Lease [Tue, 2 Oct 2012 20:14:11 +0000 (13:14 -0700)]
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
Amith Yamasani [Mon, 8 Oct 2012 21:43:20 +0000 (14:43 -0700)]
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
Jeff Brown [Tue, 9 Oct 2012 00:02:30 +0000 (17:02 -0700)]
am
2aac1a0f: Merge "Improve the power off fade animation." into jb-mr1-dev
* commit '
2aac1a0fe8fe5dea1185374ed914f95101de16ed':
Improve the power off fade animation.
Jeff Brown [Tue, 9 Oct 2012 00:00:18 +0000 (17:00 -0700)]
Merge "Improve the power off fade animation." into jb-mr1-dev
Eric Laurent [Mon, 8 Oct 2012 16:04:34 +0000 (09:04 -0700)]
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
Robert Ly [Tue, 28 Feb 2012 21:05:50 +0000 (13:05 -0800)]
docs: nfc ndef helper methods bug
5957772
Change-Id: I9c8356f44c1f9cc4a5187d40816cbfdd6212ab6e
Jim Miller [Mon, 8 Oct 2012 23:38:05 +0000 (16:38 -0700)]
Fix "checking account" string
Fixes bug
7309934
Change-Id: Ia665142b8dcd8de424312bd7bf0800d7b871b03b
Jeff Brown [Mon, 8 Oct 2012 23:21:01 +0000 (16:21 -0700)]
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
Baligh Uddin [Mon, 8 Oct 2012 22:56:02 +0000 (15:56 -0700)]
am
e70bf654: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e70bf65423056c2f336602aa9b3942ea446225e4':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 22:52:56 +0000 (15:52 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Svetoslav Ganov [Mon, 8 Oct 2012 22:53:17 +0000 (15:53 -0700)]
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.
Svetoslav Ganov [Mon, 8 Oct 2012 22:51:14 +0000 (15:51 -0700)]
Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 22:49:58 +0000 (15:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 8 Oct 2012 22:23:58 +0000 (15:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd93f9399dcd2466e3d6d84bee4b536a8a41b476
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Oct 2012 22:22:19 +0000 (15:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9059498aed3bca6294e9f93d89709454c04e0997
Auto-generated-cl: translation import
Victoria Lease [Mon, 8 Oct 2012 22:17:37 +0000 (15:17 -0700)]
am
0fb7e32a: Merge "Last position improvements for GeofenceManager" into jb-mr1-dev
* commit '
0fb7e32a0129e9e62d58ea652cc00f8a908d65b5':
Last position improvements for GeofenceManager
Victoria Lease [Mon, 8 Oct 2012 22:14:49 +0000 (15:14 -0700)]
Merge "Last position improvements for GeofenceManager" into jb-mr1-dev
Svetoslav Ganov [Mon, 8 Oct 2012 22:05:08 +0000 (15:05 -0700)]
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.
Dianne Hackborn [Mon, 8 Oct 2012 22:05:04 +0000 (15:05 -0700)]
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...
Svetoslav Ganov [Mon, 8 Oct 2012 22:01:28 +0000 (15:01 -0700)]
Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev
Dianne Hackborn [Mon, 8 Oct 2012 22:01:32 +0000 (15:01 -0700)]
Merge "Framework side of issue #
7302511: GCM client needs to use new framework API..." into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 22:01:53 +0000 (15:01 -0700)]
am
bd03f5ab: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bd03f5abb7bbd5552d49dfec4e78f3d9454238af':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Oct 2012 21:59:37 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 8 Oct 2012 21:57:37 +0000 (14:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 8 Oct 2012 21:47:48 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dd8dacad06a9f7be27ac666f7fc4a51308347aa
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Oct 2012 21:45:19 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb43315957971f47b28da90481c5e123aa441fc8
Auto-generated-cl: translation import
Dianne Hackborn [Mon, 8 Oct 2012 21:33:47 +0000 (14:33 -0700)]
Framework side of issue #
7302511: GCM client needs to use new framework API...
...to fix background->shutdown delivery race
Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.
Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.
Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
Jim Miller [Mon, 8 Oct 2012 20:42:02 +0000 (13:42 -0700)]
am
8215ddb4: Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev
* commit '
8215ddb4f5fd6d7b6444baa2416190799e3aa09e':
Properly handle cancel event in GlowPadView
Jim Miller [Mon, 8 Oct 2012 20:40:15 +0000 (13:40 -0700)]
Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev
Svetoslav Ganov [Mon, 8 Oct 2012 20:17:40 +0000 (13:17 -0700)]
Show the touch explore enable dialog for the current user.
1. We are showing a warning dialog if the user enables an accessibility
service that requests explore by touch. This dialog was shown only
for the owner but should be shown for the current user.
bug:
7304437
Change-Id: I692b5112df16405e6d2e4890aafbfde79981f973
Justin Mattson [Mon, 8 Oct 2012 19:52:36 +0000 (12:52 -0700)]
Merge "Reverse movement direction of DPAD events" into jb-mr1-aah-dev