99299 Commits

Author SHA1 Message Date
Derek Sollenberger
7fc9756f28 Merge "resolved conflicts for merge of c93c6aa5 to master-chromium" into master-chromium 2013-01-30 20:07:31 +00:00
Baligh Uddin
4607c3a964 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-01-30 19:45:54 +00:00
Derek Sollenberger
2dbd185fd0 resolved conflicts for merge of c93c6aa5 to master-chromium
Change-Id: I51429ed5359355025f873ccab11bfabbbe772a46
2013-01-30 14:32:29 -05:00
Chris Craik
c93c6aa555 Merge "Object-based DisplayList recording" 2013-01-30 18:42:56 +00:00
Nick Kralevich
1de9023190 am cae3d9f0: ZygoteInit: more dead code cleanup
# Via Nick Kralevich
* commit 'cae3d9f0ab2756e3659efc7a08830d2d7b43a05e':
  ZygoteInit: more dead code cleanup
2013-01-30 10:10:43 -08:00
Nick Kralevich
cae3d9f0ab ZygoteInit: more dead code cleanup
ZYGOTE_FORK_MODE has been set to false since 2009, and the
code indicates that runForkMode() was "retained for reference only."
Remove this dead code. There will always be a reference to this code
in git.

Change-Id: Iddfdca8379fdc6521febea81e553de763b6f4fd0
2013-01-30 10:01:51 -08:00
Nick Kralevich
c906166161 am 4ec799d4: Merge "Remove dead code."
# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit '4ec799d4c6de7e626363659508f21ee5c3c173aa':
  Remove dead code.
2013-01-30 10:00:48 -08:00
Nick Kralevich
4ec799d4c6 Merge "Remove dead code." 2013-01-30 17:57:45 +00:00
Nick Kralevich
ce35bf7934 am de3c6088: Merge "ZygoteConnection.java: Remove dead code --peer-wait"
# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit 'de3c608864be0fece8a27ef9cca8fac8b5292f5b':
  ZygoteConnection.java: Remove dead code --peer-wait
2013-01-30 09:53:52 -08:00
Nick Kralevich
de3c608864 Merge "ZygoteConnection.java: Remove dead code --peer-wait" 2013-01-30 17:47:55 +00:00
Nick Kralevich
40779e50f0 Remove dead code.
Setting capabiltities is handled by dalvik. This code
is never called.

Change-Id: I903952c43cf60ea59ec954c9168a7604d05ccaf7
2013-01-30 09:29:15 -08:00
Baligh Uddin
cd9bccc577 Import translations. DO NOT MERGE
Change-Id: I49ef5dc470755aef0901d4975f250680de056a66
Auto-generated-cl: translation import
2013-01-30 09:12:38 -08:00
Nick Kralevich
468f6c15d2 ZygoteConnection.java: Remove dead code --peer-wait
The last caller of this option was removed in
system/core commit b94fd1abcbff1eacb8a2ad79c51de21ecf8f6d65

Change-Id: I9f3540c9e61b4a93038b43983fbb8badac08a2e3
2013-01-30 08:46:06 -08:00
Przemyslaw Szczepaniak
92af275cfd am 647abce5: Deprecate unused and implementation-specific parts of TTS API
# Via Android (Google) Code Review
* commit '647abce570f3afdd667e06e9ad71738efff0e8a8':
  Deprecate unused and implementation-specific parts of TTS API
2013-01-30 01:41:37 -08:00
Przemyslaw Szczepaniak
647abce570 Deprecate unused and implementation-specific parts of TTS API
Second changeset, first one was committed too hastily.

TTS Voice-data related API was originally written with
one engine in mind (pico sVox TTS). It exposes implementation
details that should be private to the engine implementation.

- Deprecating fields of ACTION_CHECK_TTS_DATA results that were
used by sVox language packs to find out location of voice data.
Those fields are TTS engine implementation details and should be
private:
EXTRA_VOICE_DATA_ROOT_DIRECTORY
EXTRA_VOICE_DATA_FILES
EXTRA_VOICE_DATA_FILES_INFO
- Deprecating fields of ACTION_CHECK_TTS_DATA request that are
providing unnescesary functionality (it can be easily done on client
side):
EXTRA_CHECK_VOICE_DATA_FOR
- Deprecating some of the return codes of ACTION_CHECK_TTS_DATA - they
are specific to sVox pico voice data and in all cases can be replaced
by CHECK_VOICE_DATA_FAIL result code.
CHECK_VOICE_DATA_BAD_DATA
CHECK_VOICE_DATA_MISSING_DATA
CHECK_VOICE_DATA_MISSING_VOLUME
- Changing semantics of ACTION_TTS_DATA_INSTALLED intent. It's now
more generic and covers any change of available voice data set (so, not only
adding languages, but also removing them should trigger broadcast. Adding and
removing features to existing locale (like embedded synthesis) should be marked
by broadcast as well).
- Deprecating its EXTRA_TTS_DATA_INSTALLED result field - client should discover
the change by running ACTION_CHECK_TTS_DATA intent.
- Making GetSampleText intent public again - it's used by most TTS engines to
provide unique demonstation data.
- Deprecating TextToSpeech.OnUtteranceCompletedListener - it was replaced
by UtteranceProgressListener in API level 15, but no one put deprecation tag
on it.

Change-Id: Ia58af7f218dc1568570712f435782d2003260e82
2013-01-30 09:37:05 +00:00
Kenny Root
5a2cae1cb8 am 29449a3d: am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (3) and others
* commit '29449a3da7d859e8273612527949e0a200b8e798':
  One more fix for incorrect indices.
2013-01-29 23:04:39 -08:00
Kenny Root
29449a3da7 am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (2) and others
* commit '781bcd68ce7d701f5d36dd0d1b07d51ef937f0bc':
  One more fix for incorrect indices.
2013-01-29 23:01:51 -08:00
Kenny Root
781bcd68ce am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (1) and others
* commit 'c3ee1d9aea36bb7c33dee6211905d4c1ab2681a1':
  One more fix for incorrect indices.
2013-01-29 22:59:33 -08:00
Kenny Root
c3ee1d9aea am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Gerrit Code Review (1) and Stephen Hines (1)
* commit '7ad885e2e6c845dbec4f16cd71e859240741dbf9':
  One more fix for incorrect indices.
2013-01-29 22:56:40 -08:00
Kenny Root
7ad885e2e6 Merge "One more fix for incorrect indices." 2013-01-30 05:54:03 +00:00
Satoshi Kataoka
fc14e1c7a2 am da01da17: Merge "Do not turn on imes unexpectedly with unit tests"
# Via Android (Google) Code Review (1) and Satoshi Kataoka (1)
* commit 'da01da176d4798d293c90d6280ddc59c780baaa3':
  Do not turn on imes unexpectedly with unit tests
2013-01-29 18:45:36 -08:00
Satoshi Kataoka
da01da176d Merge "Do not turn on imes unexpectedly with unit tests" 2013-01-30 02:41:47 +00:00
Romain Guy
781fd2b7c8 am f5f85022: Merge "Fix graphical corruption on QCOM GPU Bug #7146141"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit 'f5f8502271b04d63c518e3aecfd5eaf557904e72':
  Fix graphical corruption on QCOM GPU Bug #7146141
2013-01-29 17:50:58 -08:00
Romain Guy
f5f8502271 Merge "Fix graphical corruption on QCOM GPU Bug #7146141" 2013-01-30 01:47:59 +00:00
Romain Guy
c3fedafc5f Fix graphical corruption on QCOM GPU
Bug #7146141

The GL_QCOM_tiled_rendering extension requires careful use of
start/endTiling when attaching a renderbuffer dynamically.

Change-Id: I20036683ed3909ffaf40cc3d57a25257e35b6fa2
2013-01-29 17:46:17 -08:00
Doug Zongker
7a8a1799ef am 58395e71: am 9c4ba4fe: am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Android Git Automerger (2) and Doug Zongker (1)
* commit '58395e71ce7e99f8149eebbf39db77798165a539':
  add android.permission.LOOP_RADIO for access to loop radio device
2013-01-29 17:11:48 -08:00
Doug Zongker
58395e71ce am 9c4ba4fe: am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Android Git Automerger (1) and Doug Zongker (1)
* commit '9c4ba4fe752b131b01aa402389c96eb8f24764b8':
  add android.permission.LOOP_RADIO for access to loop radio device
2013-01-29 17:09:03 -08:00
Doug Zongker
9c4ba4fe75 am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Doug Zongker
* commit 'b616f0c239ad61f818741909821b86aceff60b60':
  add android.permission.LOOP_RADIO for access to loop radio device
2013-01-29 17:01:01 -08:00
Dianne Hackborn
625f4a0be0 am d4d93640: Maybe fix build.
# Via Dianne Hackborn
* commit 'd4d9364019ed071509213b9ce772f4a5904d2847':
  Maybe fix build.
2013-01-29 16:17:17 -08:00
Dianne Hackborn
d4d9364019 Maybe fix build.
Change-Id: Ibad8edb15e7cc332d6c29958a386d32a96f4e755
2013-01-29 16:12:48 -08:00
Dianne Hackborn
6c9975b409 am e8ae8b89: Merge "Add GET_CONTENT protocol for allowing multiple selection."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'e8ae8b8982da37ca77bbaed8e98349d51dec824a':
  Add GET_CONTENT protocol for allowing multiple selection.
2013-01-29 15:59:49 -08:00
Dianne Hackborn
e8ae8b8982 Merge "Add GET_CONTENT protocol for allowing multiple selection." 2013-01-29 23:56:20 +00:00
Dianne Hackborn
9b771678ea am 7f54ffd0: Merge "Improve configuration of default preferred apps."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '7f54ffd0296ce6008b5ea949796e60248a85e2d8':
  Improve configuration of default preferred apps.
2013-01-29 15:56:13 -08:00
Dianne Hackborn
7f54ffd029 Merge "Improve configuration of default preferred apps." 2013-01-29 23:43:20 +00:00
Dianne Hackborn
8a2ed1d7c0 Improve configuration of default preferred apps.
The file that defines default preferred apps is now more
robust.  It is no longer a raw dump of the package
manager settings, but instead a more general list of a
target activity and filter.  When reading it, the remaining
information (match value, set of potential matches) is
determined dynamically.

Change-Id: I0edc6e0d2ed3dd2a6e2238992f18f7fc1f51d8d4
2013-01-29 15:18:29 -08:00
Daniel Sandler
f9fcb188e0 am 6fc73697: Merge "Implement support for method calls in the content tool."
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit '6fc736971a66eb4b461931a5e972d51b65bfa68f':
  Implement support for method calls in the `content` tool.
2013-01-29 12:54:52 -08:00
Daniel Sandler
6fc736971a Merge "Implement support for method calls in the content tool." 2013-01-29 20:52:44 +00:00
Daniel Sandler
d2c0c1021e Implement support for method calls in the content tool.
$ content call
    --uri content://com.example
    --method methodname
    [--arg optional_string_arg]
    [--extra name:s:foo --extra value:i:0]

The URI is just used to resolve the provider. --extra has
the same syntax as --bind.

Change-Id: I98cb89f0174a00e7c29ca0d8c8d809d453de3623
2013-01-29 14:27:21 -05:00
Michael Wright
414297828c am 8c47e856: Merge "Changes documention for how input buttons should be labelled"
# Via Android (Google) Code Review (1) and Michael Wright (1)
* commit '8c47e856b067057b5fcbb6eccfc79d1da4cff8f1':
  Changes documention for how input buttons should be labelled
2013-01-29 11:18:31 -08:00
Michael Wright
8c47e856b0 Merge "Changes documention for how input buttons should be labelled" 2013-01-29 19:09:09 +00:00
Doug Zongker
b616f0c239 add android.permission.LOOP_RADIO for access to loop radio device
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
2013-01-29 10:39:13 -08:00
Svetoslav
e1c4b5c64d am e340e68f: Merge "Update JavaDoc"
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'e340e68f1fe9c539606ad1ec2b76a3edb8f835bd':
  Update JavaDoc
2013-01-29 03:26:29 -08:00
Svetoslav
e340e68f1f Merge "Update JavaDoc" 2013-01-29 11:23:19 +00:00
Svetoslav
14ff996ce8 Update JavaDoc
Change-Id: I9644677eb715de1c4ba2f1608b38980f02bdf75d
2013-01-29 03:21:37 -08:00
Svetoslav
5cf6f8adfa am 573a18cc: Merge "Fixing the build"
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '573a18ccd883d18046dea600855d34f5c9a57fa8':
  Fixing the build
2013-01-29 02:15:48 -08:00
Svetoslav
573a18ccd8 Merge "Fixing the build" 2013-01-29 10:10:30 +00:00
Svetoslav
f5f7d9751a Fixing the build
Change-Id: I8d47c7094efc8ff458cdac58a761d5f187c8fc32
2013-01-29 02:08:54 -08:00
Svetoslav
f38a6fad79 am 686f20c2: Merge "Removing duplicated tests that use hidden APIs"
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '686f20c264ebdafea1638568f543972539088ec6':
  Removing duplicated tests that use hidden APIs
2013-01-29 01:44:36 -08:00
Svetoslav
686f20c264 Merge "Removing duplicated tests that use hidden APIs" 2013-01-29 09:40:25 +00:00
Svetoslav
dc4271ce1d Removing duplicated tests that use hidden APIs
Change-Id: If3e32e8659fcb4dc2186fea668601a93f4556a73
2013-01-29 01:38:48 -08:00