OSDN Git Service
Romain Guy [Wed, 10 Oct 2012 23:06:04 +0000 (16:06 -0700)]
Allow 9patches to shrink
Bug #
7307304
Change-Id: I1fabf6df99c18c86ab1ec0e1e398a3d6d4098496
Zhihai Xu [Wed, 10 Oct 2012 16:52:32 +0000 (09:52 -0700)]
Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev
Ken Wakasa [Wed, 10 Oct 2012 16:32:34 +0000 (09:32 -0700)]
Merge "Revert "Don't update the text services locale in the main thread"" into jb-mr1-dev
Geremy Condra [Wed, 10 Oct 2012 16:17:59 +0000 (09:17 -0700)]
am
3f542740: (-s ours) am
c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit '
3f542740065f3708f70acb48dd93651ed896e029':
DO NOT MERGE Control access to inherited methods of jsinterface objects
Geremy Condra [Wed, 10 Oct 2012 16:17:56 +0000 (09:17 -0700)]
am
dadea723: (-s ours) am
a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit '
dadea723a3e4485d2ee450ce76e772da33477f80':
DO NOT MERGE remove defunct javascript interface
Dirk Dougherty [Wed, 10 Oct 2012 16:17:49 +0000 (09:17 -0700)]
am
0c9c8d0a: am
137b8f4c: am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
0c9c8d0a065ca56676e09688c0f643904eac1c69':
Doc change: edits to TV tablet story.
Dirk Dougherty [Wed, 10 Oct 2012 16:17:48 +0000 (09:17 -0700)]
am
8048b9ec: am
28a40e01: am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
8048b9ec0c1ecc7fbe557105b87ba21329fe6169':
Doc change: Link to AVDs docs from tablet quality checklist.
Ken Wakasa [Wed, 10 Oct 2012 16:17:18 +0000 (09:17 -0700)]
Revert "Don't update the text services locale in the main thread"
This reverts commit
8fa0838bf82f43acfabc0e7fe9471e488a97796b
Change-Id: Ie790ae6dcb33d05d1fbf86c8ef28aec6fe60793a
Marco Nelissen [Wed, 10 Oct 2012 15:06:56 +0000 (08:06 -0700)]
Merge "Adjust buffer position after copying" into jb-mr1-dev
Jeff Brown [Wed, 10 Oct 2012 07:35:19 +0000 (00:35 -0700)]
Merge "Don't consider the boot completed until the animation is over." into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 07:09:51 +0000 (00:09 -0700)]
Merge "Fix build, only invalidate when creating user." into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 07:01:26 +0000 (00:01 -0700)]
Fix build, only invalidate when creating user.
Bug:
7276595
Change-Id: I322f9d76a682b2d45fc556e35381442458168fe5
Jeff Sharkey [Wed, 10 Oct 2012 06:47:00 +0000 (23:47 -0700)]
Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev
Satoshi Kataoka [Wed, 10 Oct 2012 06:36:48 +0000 (23:36 -0700)]
Merge "Don't update the text services locale in the main thread" into jb-mr1-dev
Yu Shan Emily Lau [Wed, 10 Oct 2012 06:05:36 +0000 (23:05 -0700)]
Merge "Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev
Svetoslav Ganov [Wed, 10 Oct 2012 05:01:55 +0000 (22:01 -0700)]
Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev
Jeff Sharkey [Mon, 8 Oct 2012 23:44:37 +0000 (16:44 -0700)]
Make RegisteredServicesCache multi-user aware.
RegisteredServicesCache is used to track account authenticators and
sync adapters, which can vary based on user. This change requires
that callers now provide a userId when making cache requests. It
continues persisting into a single file for now, which is keyed based
on UID.
It now watches for package broadcasts from all users, and scans
packages on-demand. It changes cache callers to provide a relevant
userId, and evicts cache entries when users are stopped.
Changes SyncManager to only work with accounts from running users,
only kicking off pending syncs once a user is started.
Bug:
7276595,
7316150
Change-Id: I79466a84aa69aa37e4bd9691c5d6221d3662ff29
Geremy Condra [Wed, 10 Oct 2012 04:37:23 +0000 (21:37 -0700)]
am
c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit '
c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
DO NOT MERGE Control access to inherited methods of jsinterface objects
Geremy Condra [Wed, 10 Oct 2012 04:32:08 +0000 (21:32 -0700)]
Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
Geremy Condra [Wed, 10 Oct 2012 04:34:33 +0000 (21:34 -0700)]
am
a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit '
a22000d244915df2098619be5fd66bf1c4d019c8':
DO NOT MERGE remove defunct javascript interface
Geremy Condra [Wed, 10 Oct 2012 04:32:00 +0000 (21:32 -0700)]
Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
Daniel Sandler [Wed, 10 Oct 2012 03:53:43 +0000 (20:53 -0700)]
Merge "Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug
7308719)" into jb-mr1-dev
Svetoslav Ganov [Wed, 10 Oct 2012 01:11:36 +0000 (18:11 -0700)]
Cannot force a shown item from an ActionMode into the overflow menu.
1. An app showing an action mode with a visible item that decides to move this item
to the overflow menu cannot do so since the action menu is not updated properly.
Specifically, ActionMenuPresenter does not clear the "is action button" property
of a menu item neither requires nor requests an action button, i.e. the item's
"show as action" property changed to be never shown on the action bar.
bug:
7319766
Change-Id: I5cfda6269466fafca1f039a3bab6397392ae9f17
Baligh Uddin [Wed, 10 Oct 2012 02:14:36 +0000 (19:14 -0700)]
Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev
Baligh Uddin [Wed, 10 Oct 2012 02:13:31 +0000 (19:13 -0700)]
Revert "Revert "Add config resource to help ATT prepaid""
Revert the revert - change is good.
This reverts commit
2133caf515660d957bb7fd05b35e7eb2f2391d48
Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
Yu Shan Emily Lau [Wed, 10 Oct 2012 02:12:46 +0000 (19:12 -0700)]
Instead of collecting the procmem output in
the test, change it as optional. This is to avoid
the tool breakage will block the whole memory test sutie.
Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
Dianne Hackborn [Wed, 10 Oct 2012 02:10:49 +0000 (19:10 -0700)]
Merge "Further work on issue #
7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev
Zhihai Xu [Tue, 9 Oct 2012 00:57:03 +0000 (17:57 -0700)]
Bluetooth multi-user updates: change bluetooth manager system service
to reject background user access. disable and enable Bluetooth when user is switched
bug
6925422
Change-Id: I52136e707da2d1ba8228c1bb8beef1414ead1893
Jeff Brown [Wed, 10 Oct 2012 01:57:07 +0000 (18:57 -0700)]
Don't consider the boot completed until the animation is over.
This fixes a problem where the screen times out shortly after
boot before the user has had a chance to interact with the device.
Now we wait until the boot animation has completed then set
boot completed, poke user activity and start the countdown.
Bug:
7316397
Change-Id: Ie5a0b1012d265e655d33cc8fba49ca349f48f1de
Selim Gurun [Tue, 4 Sep 2012 23:45:53 +0000 (16:45 -0700)]
DO NOT MERGE Control access to inherited methods of jsinterface objects
Bug:
7073422
Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.
Clean cherry pick of
94740e6c333a109be7516abbd17dd418f23b4f0c
Provided @JavascriptInterface to methods that are accessible from
js.
Clean cherry pick of
b743a23fc5bce9965c1539c3c8611614424a5aff
Add a glue logic to require use of annotations in injected accessibility
objects.
Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
Svetoslav Ganov [Wed, 10 Oct 2012 01:33:31 +0000 (18:33 -0700)]
Merge "Properly label RecentsActivity for accessibility. Bug:
7229886" into jb-mr1-dev
Dianne Hackborn [Tue, 9 Oct 2012 21:00:30 +0000 (14:00 -0700)]
Further work on issue #
7307399: Framework needs a new pre-user-shutdown...
...phase & callback API
I realized there were a few things wrong with what was there. The new
ACTION_USER_STARTING was not being sent for the first user at boot, and
there was an existing problem where ACTION_USER_STARTED was sent every
time there was a user switch.
Also improved some debug output of broadcasts to make it easier to see
what is going on in this stuff, and better reporting of why a service
couldn't be started.
Change-Id: Id8a536defbbad1f73d94a37d13762436b822fbe3
Baligh Uddin [Wed, 10 Oct 2012 00:53:36 +0000 (17:53 -0700)]
Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev
Casey Burkhardt [Wed, 10 Oct 2012 00:40:52 +0000 (17:40 -0700)]
Properly label RecentsActivity for accessibility.
Bug:
7229886
Change-Id: I440c7e9b9ef3272e287d5d4d58bcfc0e8d0735ac
Baligh Uddin [Wed, 10 Oct 2012 00:52:52 +0000 (17:52 -0700)]
Revert "Add config resource to help ATT prepaid"
breaking jb-mr1-release
This reverts commit
901ac560cafe0b8d76fd7441cbaf8749be33577c
Change-Id: I5fab4097a40e0ba31dc716967ef921c113a795a7
Svetoslav Ganov [Wed, 10 Oct 2012 00:52:00 +0000 (17:52 -0700)]
Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev
Dianne Hackborn [Wed, 10 Oct 2012 00:46:36 +0000 (17:46 -0700)]
Merge "Fix issue #
7311376: Add API to allow apps to know if they are..." into jb-mr1-dev
Chris Wren [Wed, 10 Oct 2012 00:38:29 +0000 (17:38 -0700)]
Merge "default the screen on during the dream." into jb-mr1-dev
Dirk Dougherty [Wed, 10 Oct 2012 00:36:26 +0000 (17:36 -0700)]
am
137b8f4c: am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
137b8f4c0e8fdc354432231362a0bfbcf11ed96e':
Doc change: edits to TV tablet story.
Dirk Dougherty [Wed, 10 Oct 2012 00:33:52 +0000 (17:33 -0700)]
am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
f761a9a634a43662525d9c0c537ac5499263fd81':
Doc change: edits to TV tablet story.
Winson Chung [Tue, 9 Oct 2012 01:19:09 +0000 (18:19 -0700)]
Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug
7308719)
Change-Id: Idbaf377d1cd086cf5d8244d6c7ca084145ccf217
Dirk Dougherty [Wed, 10 Oct 2012 00:31:34 +0000 (17:31 -0700)]
Merge "Doc change: edits to TV tablet story." into jb-dev-docs
Eric Laurent [Wed, 10 Oct 2012 00:25:27 +0000 (17:25 -0700)]
Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev
John Spurlock [Wed, 10 Oct 2012 00:24:58 +0000 (17:24 -0700)]
Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev
Craig Mautner [Wed, 10 Oct 2012 00:18:30 +0000 (17:18 -0700)]
Merge "Remove debugging statements before final ROM." into jb-mr1-dev
Irfan Sheriff [Wed, 10 Oct 2012 00:08:39 +0000 (17:08 -0700)]
Fix build
had local changes from b/
7318044
Change-Id: Idc6907d648a07d36f93dee859e361e9655cdd8e6
Dianne Hackborn [Tue, 9 Oct 2012 22:36:59 +0000 (15:36 -0700)]
Fix issue #
7311376: Add API to allow apps to know if they are...
...running as the foreground user
Add UserManager.isUserRunning() which is the public version of the
existing method on ActivityManager.
Also add UserManager.isUserRunningOrStopping() since that seems like
it will be useful.
And fix the internal function that returns the array of currently
running users to not include stopped users.
Change-Id: I84672fa8748fc027fd402729586b5603f640e498
Jeff Brown [Tue, 9 Oct 2012 23:52:04 +0000 (16:52 -0700)]
Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev
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
Eric Laurent [Tue, 9 Oct 2012 23:41:32 +0000 (16:41 -0700)]
fix concurrent headset and HDMI connection
Fix a bug in WiredAccessoryManager causing an
HDMI disconnection to be signaled to AudioService when a
headset is connected.
Bug
7313250.
Change-Id: I7c6446104c55f9a4fc146abe7020df45ad6ba5e7
Svetoslav Ganov [Tue, 9 Oct 2012 23:25:54 +0000 (16:25 -0700)]
Return true on successful accessiblity action click/long click.
1. If a view is clickable or long clickable perfroming the corresponding
accessiblity action should return true no matter whether there is a
registered on click/long click listener. Currently true is returned
only if there is a listener but it is also possible that a sub-class
overrides performClick and does work there. For example CompoundButton.
Now if the view is clickable or long clickable we will call the
perfrom* method and return true, which is we clicked.
2. Fixed some JavaDoc indentation.
bug:
7318777
Change-Id: Id603fee378b8f7d07f1128b5641ede57640bab53
Irfan Sheriff [Tue, 9 Oct 2012 23:31:02 +0000 (16:31 -0700)]
Merge "Disable poor network avoidance by default" into jb-mr1-dev
John Spurlock [Tue, 9 Oct 2012 22:30:11 +0000 (18:30 -0400)]
Disable Camera + Search until USER_SETUP_COMPLETE.
Check the status of Settings.Secure.USER_SETUP_COMPLETE for the current
user when showing the keyguard, disabling the Camera + Search touchpoints
entirely until the user makes it through the setup wizard.
Bug:
7308791
Change-Id: Ic8e3596582c2aefc7fe15af1824ed6bfd541dffa
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 22:57:06 +0000 (15:57 -0700)]
Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev
Jeff Brown [Tue, 9 Oct 2012 22:47:30 +0000 (15:47 -0700)]
Prevent full wake lock from keeping device awake while dreaming.
A dream may itself hold a wake lock in order to keep the screen
bright as it runs. However this wake lock also causes the device
to stay awake even when it is not plugged in which is undesirable.
This change makes full wake locks behave differently when napping
or dreaming. The wake lock still keeps the screen bright but
it does not prevent the device from falling asleep. This is
similar to our policy of ignoring full wake locks completely when
the device is manually put to sleep by the user.
Bug:
7295909
Change-Id: Id99e82d2143ae1a81629281d6407d7527efb8137
Dirk Dougherty [Tue, 9 Oct 2012 22:52:13 +0000 (15:52 -0700)]
am
28a40e01: am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
28a40e01fec9e00c74e52a88a5f6fca98057af91':
Doc change: Link to AVDs docs from tablet quality checklist.
Dirk Dougherty [Tue, 9 Oct 2012 22:50:12 +0000 (15:50 -0700)]
am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
Doc change: Link to AVDs docs from tablet quality checklist.
Irfan Sheriff [Tue, 9 Oct 2012 22:49:33 +0000 (15:49 -0700)]
Disable poor network avoidance by default
Bug:
7318044
Change-Id: Icf27e823453eeaba901aad6f3f8eedea242794f9
Dirk Dougherty [Tue, 9 Oct 2012 22:48:34 +0000 (15:48 -0700)]
Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
Dirk Dougherty [Tue, 9 Oct 2012 22:43:10 +0000 (15:43 -0700)]
Doc change: Link to AVDs docs from tablet quality checklist.
Change-Id: Ifb20a903a0dd32009b6db6e583a6d0c86cddb52e
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: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: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: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: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:25:12 +0000 (13:25 -0700)]
Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev
Craig Mautner [Tue, 9 Oct 2012 20:23:08 +0000 (13:23 -0700)]
Remove debugging statements before final ROM.
Change-Id: I18afd1a4c4f8f945308edc9b3af48b8c8adb3b9e
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:22:02 +0000 (12:22 -0700)]
Merge "Multiuser love for LocationManager" into jb-mr1-dev
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: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: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: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: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: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:03:30 +0000 (17:03 +0200)]
Fix one case where recents is sometimes not visible
Bug:
7299653
Satoshi Kataoka [Tue, 9 Oct 2012 08:34:04 +0000 (17:34 +0900)]
Don't update the text services locale in the main thread
Bug:
6761326
Change-Id: I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
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: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: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