112640 Commits

Author SHA1 Message Date
Kenny Root
7bc59add59 am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit"
* commit '753c1a3342357eed6b29c08ad8ca708755d84390':
  Move helper function to webkit
2013-09-12 23:39:01 -07:00
Kenny Root
753c1a3342 am 457f0f5e: Merge "Move helper function to webkit"
* commit '457f0f5e486c158bbe9816df39d2cbc52cec3b51':
  Move helper function to webkit
2013-09-12 23:35:13 -07:00
Kenny Root
457f0f5e48 Merge "Move helper function to webkit" 2013-09-13 06:30:53 +00:00
Kenny Root
cb4317a5a7 Move helper function to webkit
This particular helper function is being removed from NativeCrypto, so
move it here as it's the last user of it.

Change-Id: Iea13ba499487d838068d6156d4d1e6861d05eb36
2013-09-12 23:00:54 -07:00
Lajos Molnar
6118745be5 am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev
* commit 'ab62870c7e787323057d3b16a3ff1fd118fb5925':
  MediaFormat: add getInteger with default value convenience method
2013-09-12 21:38:04 -07:00
Jean Chalard
4895ec3dcc am 940a2ad6: Merge "Don\'t send the same values to onUpdateSelection repeatedly" into klp-dev
* commit '940a2ad69eaf25ef16b6f470f759f9eef28fc0c5':
  Don't send the same values to onUpdateSelection repeatedly
2013-09-12 21:38:01 -07:00
Lajos Molnar
736469ad5d am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev
* commit '8c16943ef3259b8194c310d41edc13a783249250':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
2013-09-12 21:37:58 -07:00
Alan Viverette
aca95ca0e3 am 2a65a283: Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev
* commit '2a65a2839e9b3e59a72348ee088f86cda7df604a':
  Add live region politeness to View, AccessibilityNodeInfo
2013-09-12 21:37:50 -07:00
Svetoslav
9282b9ac8e am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev
* commit 'b72ff5aa4b8be587bcea82761aa08cd8c14b8b48':
  Remove unneeded print APIs and update the min margins APIs.
2013-09-12 21:37:37 -07:00
Romain Guy
0885b29165 am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev
* commit '4801a4f90710427f71b717c6869a63113846689a':
  Always disable the clip for layers Bug #8149344
2013-09-12 21:37:32 -07:00
Jeff Sharkey
cf76be7195 am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev
* commit '95a6560f63563aeb36a56fb0384685a2f925d3c1':
  DocumentsUI tablet support.
2013-09-12 21:37:18 -07:00
Robert Greenwalt
3d52eb7f1d am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev
* commit '14e55996722db1e74996b837c136a6e188143718':
  Fix Batched Scan Results to give Timestamp in uS
2013-09-12 21:37:13 -07:00
Wink Saville
d8fcc7951f am 5fbfb81d: Merge "Define config_volte_replacement_rat." into klp-dev
* commit '5fbfb81d31d452f75bc088d380711642993fef1c':
  Define config_volte_replacement_rat.
2013-09-12 21:37:08 -07:00
Stephen Hines
7d400eadb7 am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev
* commit '9d5c33c58451aac8566b8df8426265cedd3e610f':
  Fix build break with missing VDBG.
2013-09-12 21:37:03 -07:00
Raph Levien
dcb2c68fd1 am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev
* commit '7558ec405f67b59afbf6089d13928cfdb2f950ff':
  Fix for AIOBE at android.text.AndroidBidi.directions
2013-09-12 21:36:57 -07:00
Selim Gurun
2b274021f2 am 76ffaa58: Merge "Publish Print Api for Webview" into klp-dev
* commit '76ffaa5808331591d9db4c2abfe9f739eebb0be9':
  Publish Print Api for Webview
2013-09-12 21:36:54 -07:00
Lajos Molnar
ab62870c7e Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev 2013-09-13 02:18:23 +00:00
Jean Chalard
940a2ad69e Merge "Don't send the same values to onUpdateSelection repeatedly" into klp-dev 2013-09-13 02:16:47 +00:00
Lajos Molnar
8c16943ef3 Merge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into klp-dev 2013-09-13 02:16:27 +00:00
Alan Viverette
2a65a2839e Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 2013-09-13 01:45:10 +00:00
Svetoslav
b72ff5aa4b Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 2013-09-13 01:43:41 +00:00
Romain Guy
4801a4f907 Merge "Always disable the clip for layers Bug #8149344" into klp-dev 2013-09-13 01:18:31 +00:00
Jeff Sharkey
95a6560f63 Merge "DocumentsUI tablet support." into klp-dev 2013-09-13 00:21:53 +00:00
Alan Viverette
77e9a28e2f Add live region politeness to View, AccessibilityNodeInfo
Alters the content change API to contain a bit mask of types of
changes represented by the event. Live regions send CONTENT_CHANGED
events immediately. Removes unused APIs for EXPANDABLE/EXPANDED.

BUG: 10527284
Change-Id: I21523e85e47df23706976dc0a8bf615f83072c04
2013-09-12 17:16:09 -07:00
Robert Greenwalt
14e5599672 Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev 2013-09-13 00:04:30 +00:00
Svetoslav
651dd4e6ee Remove unneeded print APIs and update the min margins APIs.
1. Removed unneeded code in Resolution that was storing its
   label as resource and package name. We do not have predefined
   resolutions, therefore we always persist the label.

2. Renamed the print attribute margins to minMargins to reflect
   that these are the minimal margins the printer support. Updated
   the docs as well.

3. Renamed the create method of all builder to build.

bug:10727487

Change-Id: Ie72ab8aaa5215b8bd2853885011b3b4efa4deb2e
2013-09-12 16:58:58 -07:00
Wink Saville
5fbfb81d31 Merge "Define config_volte_replacement_rat." into klp-dev 2013-09-12 23:49:50 +00:00
Jeff Sharkey
88f322c311 DocumentsUI tablet support.
Shows as a faux dialog on larger tablets, since the normal dialog
themes from framework don't support action bars.  Instead, this hacks
itself to look like a dialog with an InsetDrawable.  Detects touches
in dim area to dismiss dialog.

Show all action bar icons on tablets, and roots panel is always
visible with a different shadow. Show settings in dialog. Allow mode
switches in recents.

Bug: 10329832
Change-Id: Id02982ce7b0d4694962d32f8d5286fdfcc207208
2013-09-12 16:39:50 -07:00
Stephen Hines
9d5c33c584 Merge "Fix build break with missing VDBG." into klp-dev 2013-09-12 23:33:25 +00:00
Raph Levien
7558ec405f Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev 2013-09-12 23:28:29 +00:00
Selim Gurun
76ffaa5808 Merge "Publish Print Api for Webview" into klp-dev 2013-09-12 23:22:29 +00:00
Raph Levien
68669a42fb Fix for AIOBE at android.text.AndroidBidi.directions
This fixes bug 9900288: Multiple apps crashing; AIOBE at
android.text.AndroidBidi.directions.

The AndroidBidi.directions() method was not correctly handling the case
of a run of length 0, causing ArrayIndexOutOfBoundsException. This
patch simply avoids accessing the levels array in that case.

Change-Id: I036a85b7792ea3364725a87033ca74b94f0e93a1
2013-09-12 16:21:39 -07:00
Stephen Hines
cbaf152588 Fix build break with missing VDBG.
Change-Id: Iaf64cf49300a6a0a91374efa3030d6894367c9b8
2013-09-12 16:16:00 -07:00
Romain Guy
1de466fc91 Always disable the clip for layers
Bug #8149344

Change-Id: Ifd413cadb171232eb846b3d91b05b2d2457b9f35
2013-09-12 23:13:38 +00:00
Svetoslav
a03cf04b8d am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev
* commit '25f17f295b4da464a2758c11a02cabb51bf4722f':
  Not change the print options on printer change if possible.
2013-09-12 15:40:28 -07:00
Svetoslav
25f17f295b Merge "Not change the print options on printer change if possible." into klp-dev 2013-09-12 22:38:35 +00:00
Lajos Molnar
24390c11b2 MediaFormat: add getInteger with default value convenience method
Change-Id: I58947a2f4a286fef74f74cb189469278056d4759
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-09-12 15:35:31 -07:00
Lajos Molnar
9d48089595 Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
Call selectTrack/setSubtitleWidget only from MP's looper or the
applications's event thread, which is the same for now (we only
support subtitles in VideoView.)

Change-Id: Ic1de923b801f28657f37e0330b95c321931a6960
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10691837
Bug: 10326117
2013-09-12 15:35:31 -07:00
Vinit Deshapnde
4d1cef6b3f am 96ece970: Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev
* commit '96ece97073d197a056a9314ceca8a4a8ba445c26':
  Disable additional logging in WifiConfigStore/WifiNative
2013-09-12 15:22:05 -07:00
Vinit Deshapnde
96ece97073 Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev 2013-09-12 22:19:15 +00:00
Jeff Brown
9def46c976 am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev
* commit '09652ac1db59b70de47ff5ea49953773312a171f':
  Allow phone to enter suspend with positive proximity.
2013-09-12 15:18:25 -07:00
Jeff Brown
09652ac1db Merge "Allow phone to enter suspend with positive proximity." into klp-dev 2013-09-12 22:15:38 +00:00
Chris Craik
3f30e67afb am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into klp-dev
* commit '88ee0dac81dec12aefdeee23072df9b3864a06a4':
  Move DeferredDisplayState out of ops
2013-09-12 15:11:27 -07:00
Chris Craik
88ee0dac81 Merge "Move DeferredDisplayState out of ops" into klp-dev 2013-09-12 22:08:54 +00:00
Vinit Deshapnde
3569fdd9af Disable additional logging in WifiConfigStore/WifiNative
It was introduced to debug the disappearing APs; now that we think that
we've got to the bottom of it, it is being disabled by default. Set VDBG
to true to get it back.

Bug: 10568538

Change-Id: I226cacf48cccba9671f09164bbb50380adc6b322
2013-09-12 14:53:46 -07:00
Jeff Brown
ec0832133a Allow phone to enter suspend with positive proximity.
As part of the power manager rewrite in JB MR1, we removed the ability
for the phone to suspend with positive proximity because it was not
clear that the proximity sensor was always correctly registered as
a wake-up source.  The sensor service itself does not contain any
code to manage wake-ups.  Therefore proximity sensor based wake-up
relies on the sensor driver acquiring a timed wake lock when the
sensor reports a negative result.  This behavior is not very well
defined in the sensor HAL so there is a chance that it will not
work reliably on all devices.

This change adds a new config.xml resource to specify whether the
device should be allowed to suspend when the screen is off due to
positive proximity.  Devices that support this feature should set
the "config_suspendWhenScreenOffDueToProximity" resource to "true" in
their resource overlays.  The feature is disabled by default.

Bug: 9760828
Change-Id: Ic65ab7df0357271b133e2e44f5e35e7756e1e9e0
2013-09-12 14:37:21 -07:00
Svetoslav
cc65b0c325 Not change the print options on printer change if possible.
If the user selects some print options from the dialog and then
changes the printer to one that has the same capabilities the
selections in the UI should not change.

bug:10631856

Change-Id: Ia76ce58c446815e3498d2f4b4739dee62d11d96a
2013-09-12 14:29:53 -07:00
Robert Greenwalt
dee971b98c Fix Batched Scan Results to give Timestamp in uS
ScanResult should have timestamp in uS but we are getting age in ms
from the wifi driver - multiply to have the same units though not
the implied precision.

bug: 10410465
Change-Id: Idf5c5996d69a4793dae3d74edb790d40b9bd3298
2013-09-12 14:23:51 -07:00
Jeff Brown
3cb86769fd am 26267660: Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev
* commit '26267660957a4428a66d8f142e2bdfa6ce6fe12f':
  Make View onKeyUp symmetric with onKeyDown.
2013-09-12 13:55:44 -07:00
Jeff Brown
2626766095 Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev 2013-09-12 20:53:16 +00:00