109670 Commits

Author SHA1 Message Date
Michael Wright
22fdce9097 Merge "resolved conflicts for merge of 443feae6 to master" 2013-07-29 23:38:00 +00:00
Christopher Tate
e339319258 Merge "Turn off Alarm Manager logspew pending a more friendly implementation" 2013-07-29 23:31:55 +00:00
Michael Wright
9e40e61e3b resolved conflicts for merge of 443feae6 to master
Change-Id: I70b1651bc226c68db0ad0431647c21c6a4866b17
2013-07-29 16:27:45 -07:00
Christopher Tate
cdccf6423d Turn off Alarm Manager logspew pending a more friendly implementation
Bug 10055940

Change-Id: I75bcbdf6177f5faa41f420518513a22f47bcac5e
2013-07-29 16:23:05 -07:00
Jean-Baptiste Queru
00157c0d46 am 6c0fe0df: Merge "MediaFormat: Fix the documentation link to the AAC profile constants"
* commit '6c0fe0df4ea35fba69f805e18c8c88c0be31c36f':
  MediaFormat: Fix the documentation link to the AAC profile constants
2013-07-29 16:07:12 -07:00
Jean-Baptiste Queru
6c0fe0df4e Merge "MediaFormat: Fix the documentation link to the AAC profile constants" 2013-07-29 23:03:00 +00:00
Michael Wright
443feae63d am b0326880: Merge "Remove incorrect keymapping"
* commit 'b0326880a91a7c9761d56663bae559034df91e70':
  Remove incorrect keymapping
2013-07-29 15:56:38 -07:00
Michael Wright
64168ed757 Merge "Remove incorrect keymapping" 2013-07-29 22:53:56 +00:00
Michael Wright
b0326880a9 Merge "Remove incorrect keymapping" 2013-07-29 22:50:01 +00:00
Michael Wright
6fc03389c7 Remove incorrect keymapping
Turns out Snakebytes produce all 0s for their vendor / product IDs. This
somehow got the vendor / product ID of an international apple keyboard, which
will break them. Unfortunately, this also means we cannot map Snakebyte
controllers at all.

Relevant bug: https://code.google.com/p/android/issues/detail?id=58202

Change-Id: I09d246b1ab793ec04a19d558f6b98badac48b20f
2013-07-29 15:48:55 -07:00
Wink Saville
2e581434c8 Merge "Add network type TYPE_MOBILE_IA." 2013-07-29 22:24:50 +00:00
Jason Sams
d979208974 Relax restriction on Colormatrix and add Add step.
Change-Id: Iccb519bb40f58f02346b5c0a10c1378cb853e3f8
2013-07-29 22:09:08 +00:00
Wink Saville
5e56bc5437 Add network type TYPE_MOBILE_IA.
Add a network type for establishing connections to the apn used for
the initial connection.

Enable some debug for now.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
2013-07-29 15:02:29 -07:00
Alan Viverette
80e7270085 Implement drag to open overflow menu, lift to select
BUG: 9437139
Change-Id: Iaa962453ba1b2c739a04b6b1be4f6de1fb2fa752
2013-07-29 13:59:41 -07:00
Michael Wright
2c126204a5 Remove incorrect keymapping
Turns out Snakebytes produce all 0s for their vendor / product IDs. This
somehow got the vendor / product ID of an international apple keyboard, which
will break them. Unfortunately, this also means we cannot map Snakebyte
controllers at all.

Relevant bug: https://code.google.com/p/android/issues/detail?id=58202

Change-Id: I59e134f8d1eb059fdf6823e65d6ce5387428029e
2013-07-29 13:54:46 -07:00
Dianne Hackborn
bf36ee2b0c Allow services to execute in the background scheduling group.
If a service is being executed due to a call from a background
process, there is no reason for its process to be brought up
to the foreground scheduling group to do its work.  So, don't.

Change-Id: I0f4f9f2fdcc3481ca4ad2e4e3deb43b8edbbd897
2013-07-29 13:50:52 -07:00
Jonathan Dixon
d8501485e3 Build fix for WebViewFactory
Make fields public again until users are no longer using them

Change-Id: I27d06ca8478f5ba44940e8ce15d65df97cbbb5f1
2013-07-29 13:05:52 -07:00
Jonathan Dixon
01914014ca Merge "Add accessors for WebViewFactory.UseExperimentalWebView" 2013-07-29 18:50:55 +00:00
Jonathan Dixon
a7eaa8ee22 Add accessors for WebViewFactory.UseExperimentalWebView
In preperation for flag-flip, have Settings app access the current
state via methods that are neutral to the on/off state.
Also setup the property to change name when enabled by default, to reset
any user changes to this setting.

Change-Id: I55017bcd89573c1ecac7de8913264d9cf66fdcd9
2013-07-29 11:45:34 -07:00
Craig Mautner
5259ffba25 Merge "Move Recents task to back when hiding view." 2013-07-29 17:33:11 +00:00
Przemyslaw Szczepaniak
93d34a61db Fix TTS tests.
Fix breakages steaming from recent changes:
- onGetLanguage is no longer called anywhere (it's used in API <= 17),
tests for it no longer apply.
- onLoadLanguage is called as item on synthesis thread queue. To return
value to client asap, onIsLanguageAvailable is called as well - added
missing expectations for mocks.

Change-Id: I205bc406f085e2c2f7e98f8495ddb96ad3701b97
2013-07-29 16:30:04 +00:00
Baligh Uddin
029f8b545e Import translations. DO NOT MERGE
Change-Id: I4202ba985aa6f1753fc523768a00b8b49b42699c
Auto-generated-cl: translation import
2013-07-29 08:38:01 -07:00
Baligh Uddin
09419bb6ad Import translations. DO NOT MERGE
Change-Id: Ia27c9de8bb6e8307f3f1fcaf69bee46eb361ed67
Auto-generated-cl: translation import
2013-07-29 08:24:21 -07:00
John Spurlock
9ba21fdc9d Tweak system gesture listener.
Swipe gestures now need only travel a status bar's length
to trigger.  Name distance threshold variable appropriately
to avoid future confusion.

Bug: 10045892
Change-Id: I70fcf218e97c85e2653560bf2e2242d9c36537fd
2013-07-29 10:38:47 -04:00
Satoshi Kataoka
eb219ee190 Change visibility of the hidden input method utility
Change-Id: I66303bc9e056388fef8cc884d7d98b0660ccdd15
2013-07-29 18:50:49 +09:00
Craig Mautner
211cb86ab2 Move Recents task to back when hiding view.
Whenever the Recents activity actively hides itself move its task
to the back of the activity stack behind the home task. Otherwise
we get into a loop of the bck key returning to the Recents task
when it is intended to move to the home app.

Fixes bug 9750207.

Change-Id: I7d69f28368db148cb493bf54867df084907910ec
2013-07-28 17:59:09 -07:00
Mathias Agopian
cb92a8d942 fix SDK build
Change-Id: I41c19740b8f0532dbd6184e13bae43a13aaa46e2
2013-07-27 17:16:53 -07:00
Mathias Agopian
9fe5b550e1 Merge "single buffer mode for SurfaceTexture" 2013-07-27 02:35:06 +00:00
Mathias Agopian
e591b49de0 single buffer mode for SurfaceTexture
Bug: 9891035
Change-Id: Ib9cc2b64f7ff3c084ef1d7db442db8e7a24a923d
2013-07-26 19:33:54 -07:00
Jonathan Dixon
fa80ad95d3 Merge "Remove spurious @Deprecate tag from WebView.onMeasure" 2013-07-27 01:40:18 +00:00
Chong Zhang
d7c05c2ca9 Merge "Select BT route when currently selected route becomes unavailable" 2013-07-26 23:46:46 +00:00
Jonathan Dixon
697c8ed523 Remove spurious @Deprecate tag from WebView.onMeasure
onMeasure is not deprecated, this tag is spurious (and has no effect on
the api.txt or SDK anyway)

Change-Id: Iae003727649e86db2e0adaa5071399b676526c38
2013-07-26 16:40:02 -07:00
Colin Cross
ddb1428ab6 Merge "set the extra_free_kbytes kernel vm tunable" 2013-07-26 23:09:09 +00:00
Colin Cross
59d80a5270 set the extra_free_kbytes kernel vm tunable
Set the sys.sysctl.extra_free_kbytes property, which will proxy
through init to the /proc/sys/vm/extra_free_kbytes tunable (on
kernels where it exists).  This will ask the kernel to keep
more memory free, causing lowmemorykiller to fire earlier and
allocations to succeed faster.

The size is set to 3 full screen 32bpp buffers.  Products can
override the size with an absolute or adjustment value using
overlays config_extraFreeKbytesAbsolute and
config_extraFreeKbytesAdjust.

Bug: 10024467
Change-Id: Ib4d4507513ec3c1f4d4ceeb81ed632d1ad643437
2013-07-26 16:06:45 -07:00
Mathias Agopian
d06db894b2 Merge "get rid of HAL pixelformats 5551 and 4444" 2013-07-26 23:04:50 +00:00
Alan Viverette
7e897aa600 Merge "Show FastScroller thumb on mouse-over" 2013-07-26 22:56:39 +00:00
Chong Zhang
2e5fbf5521 Select BT route when currently selected route becomes unavailable
Bug: 10003524
Change-Id: I5de740fac9f2bc2a56125296defe892a8deb505e
2013-07-26 15:36:37 -07:00
Dianne Hackborn
db983e9a9c Merge "Proc stats: include information about config." 2013-07-26 22:25:37 +00:00
Dianne Hackborn
244f5d24e1 Proc stats: include information about config.
We now include in the app ops information about the device runtime
config that is relevant.  Currently this is the dalvik runtime in
use and the webview.  In checkin, this data looks like:

config,libdvm.so,webview

Change-Id: I85fd53418bd43595468f23ec8619e772fdaee7e1
2013-07-26 15:23:11 -07:00
Christopher Tate
47cb93dd6e Merge "Maintain ordering when alarm removal alters batch bounds" 2013-07-26 22:12:32 +00:00
Christopher Tate
4cb338de35 Maintain ordering when alarm removal alters batch bounds
Also: turn off verbose logging, but enable a new debugging
consistency check.

Bug 9965704

Change-Id: Ib20fb8b6275b77ff98291cf12a43b2a1128ab4b9
2013-07-26 15:03:53 -07:00
Mathias Agopian
b251f3d0c6 get rid of HAL pixelformats 5551 and 4444
Change-Id: I6a6c4c656d80280eb85f90f99f35721ffca285df
2013-07-26 14:58:00 -07:00
Marco Nelissen
3f44fae1dd am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"
* commit '778029776bac60856af7e97e19deb7b1f42b1984':
  Fix NullpointerException in MediaMetadataRetriever
2013-07-26 14:55:00 -07:00
Marco Nelissen
778029776b am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"
* commit '161b3624c2243cc5267287ebb5107cecffc918d1':
  Fix NullpointerException in MediaMetadataRetriever
2013-07-26 14:52:41 -07:00
Marco Nelissen
161b3624c2 Merge "Fix NullpointerException in MediaMetadataRetriever" 2013-07-26 21:13:59 +00:00
Jim Miller
c82bcca551 Merge "Keyguard doesn't need new MANAGE_DEVICE_ADMINS permission" 2013-07-26 21:06:18 +00:00
Mathias Agopian
9f213c8b64 Merge changes I487d4eef,Ia750811f
* changes:
  get rid of PixelFormatInfo and simplify things
  get rid of PIXEL_FORMAT_A_8
2013-07-26 20:56:23 +00:00
David Christie
54e5f0eb76 Merge "Revert "Add WorkSource capability to AlarmManager"" 2013-07-26 19:45:28 +00:00
Alex Ray
da85ef3082 Merge "libandroid_runtime: android_print needs NELEM def" 2013-07-26 19:42:31 +00:00
David Christie
f10f9ea06c Revert "Add WorkSource capability to AlarmManager"
This reverts commit 02600fb66b805c161e35f6c787372e4074f2213f.

Broke some tests.

Change-Id: Ic47b23a935bf90aba817073c27cd247306db7d5f
2013-07-26 19:40:53 +00:00