110118 Commits

Author SHA1 Message Date
Alan Viverette
43a1e3d319 Move caption style to its own class, add presets
BUG: 9926077
Change-Id: I14e809c5a95103e57d30f4273399e9914af52b56
2013-08-02 16:45:03 -07:00
Igor Murashkin
b7645acfd9 Merge "graphics: Update ImageFormat#YUV_420_888 javadoc" 2013-08-02 23:43:54 +00:00
Igor Murashkin
7a600ff65f graphics: Update ImageFormat#YUV_420_888 javadoc
* Make it clear that the Y-plane is not interleaved for YUV_420_888
* Make it clear that the U/V plane have the same stride
* Make it clear what the order of Y/U/V planes is

Change-Id: Id85d7c68e84382149dbf0e8b4e965ba2988326fe
2013-08-02 16:39:03 -07:00
Zhijun He
111fd86c7a Merge "MediaFrameworkTest: Add camera capture result callback test" 2013-08-02 23:38:24 +00:00
Craig Mautner
46ac6fa614 Add force default orientation.
Devices can be configured to remain in their default landscape or
portrait orientation by setting config_forceDefaultOrientation true
in overlay/.../values/config.xml.

Activities that desire to run in the non-default orientation are
supported by creating a logical display within the physical display.
Transitions to and from the activity perform a crossfade rather than
the normal rotation animation.

Also, improve SurfaceTrace debug output.

Fixes bug 9695710.

Change-Id: I053e136cd2b9ae200028595f245b6ada5927cfe9
2013-08-02 16:23:58 -07:00
Dirk Dougherty
b6cb0437ef Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 2013-08-02 22:49:11 +00:00
Tim Murray
881891c020 Merge "Handle updates to RS C++ API." 2013-08-02 22:34:21 +00:00
Tim Murray
250b1cfc83 Handle updates to RS C++ API.
Change-Id: I73127fc7369643b94d4a49f31a516b50c74b54ac
2013-08-02 15:31:29 -07:00
Scott Main
9a0087f227 Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 2013-08-02 22:27:14 +00:00
Zhijun He
693e21d605 MediaFrameworkTest: Add camera capture result callback test
Also refactor the code to reduce code duplication.

Change-Id: I428ad73510043ebf9e62cd7841bfdb683c96f9bc
2013-08-02 15:24:45 -07:00
Elliott Hughes
60ae2617b4 Merge "If frameworks wants ASCII casing, it should explicity ask for it." 2013-08-02 22:13:07 +00:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
2013-08-02 15:12:32 -07:00
Glenn Kasten
97d50425a4 Don't doubly initialize fields in constructor
Change-Id: Id3b4911a7954a5a908764683cc7b8d8515d4482a
2013-08-02 15:12:04 -07:00
Glenn Kasten
896a7f5fee Clean up throws in AudioRecord and AudioTrack
Remove dead assignments to member fields in constructor prior to throw.
Execution doesn't continue execution, so no need to initialize fields.

throw doesn't need parentheses.

Fix indentation.

Change-Id: I2bf1b8bfa2c836e53a41eea67552cba40dc6fd43
2013-08-02 15:05:00 -07:00
Scott Main
14617a83a6 am efd288a2: am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
* commit 'efd288a2619addd490bc07766b2cd18e82ec2051':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
2013-08-02 14:56:21 -07:00
Glenn Kasten
a667ff30e4 Explicitly compare raw pointers to NULL
Change-Id: If76a15509d4121e391e28f26ca273cc00552efa8
2013-08-02 14:51:12 -07:00
Scott Main
efd288a261 am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
* commit '2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
2013-08-02 14:29:09 -07:00
Scott Main
2a6666207d am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
* commit '1f19690322523d5a28051c55353735513638ca39':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
2013-08-02 14:27:40 -07:00
Svetoslav Ganov
bb9b300787 Merge " First cut of the print notifications." 2013-08-02 21:24:38 +00:00
Scott Main
1f19690322 Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 2013-08-02 21:23:55 +00:00
Svetoslav Ganov
4d79d7821d Merge "Revert "ssss"" 2013-08-02 21:22:59 +00:00
Svetoslav Ganov
8c43376ea8 First cut of the print notifications.
1. Added notifications for a queued print job, for a started print job,
       for ongoing canceling a print job, and for a failed print job. The
       notifications for queued and started state have a cancel action. The
       notification for failed print job has a cancel and a restart action.

    2. Propagating failure message from the print service to the notifications.

    3. PrintJobConfigActivity was not setting the initial value for the
       print job copies and was not updating the UI immediately after creation.

    4. Refactored PrintJobConfigActivity to avoid using the hack to avoid
       reaction for item selection change in a spinner for an event that
       happened before the callback was registered.

    5. Removed the label attribute from PrinterInfo and now PrinterId is
       composed of the printer name and the service component name. This
       is nice since for restarting print jobs we do not need to store
       information about the printer except the printer id which is
       already part of the PrintJobInfo's data. Also the printer name
       is not expected to change anyway.

    6. Allowing cancellation of a queued print job. Also no print job is
       cancelled without asking the managing print service to do that.
       Before we were immediately canceling print jobs in queued state
       but it was possible for a buggy print service to not set the
       print job state to started before starting to do expensive work
       that will not be canceled.

    7. PrintServiceInfo was throwing an exception the the meta-data
       XML for the print service was not well-formed which would crash
       the system process. Now we just ignore not well-formed meta-data.

    8. Removed unused permissions from the PrintSpooler's manifest.

Change-Id: Iba2dd14b487f56e137b90d1da17c3033422ab5e6
2013-08-02 14:22:22 -07:00
Svetoslav Ganov
e67b5e314f Revert "ssss"
This reverts commit 650f0ee31bbd2a23dc64b60caba3a52e7665398c.

Change-Id: Iae83ca6ccb7feccb74069bf09cfb3150c03ec710
2013-08-02 21:19:37 +00:00
Svetoslav Ganov
d347168f50 Merge "ssss" 2013-08-02 21:15:36 +00:00
Dmitry Shmidt
ec90545b5f dhcp: Get mtu property from dhcp results
Change-Id: I1b032094e0945b27d98f7ac786247b7cc9d60131
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-08-02 14:07:50 -07:00
Joe Fernandez
ab1f29d935 docs: OpenGL Training sample code fixes
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit 6da22f88434543e8796e0151f4bb11d74c16e847)
2013-08-02 20:57:03 +00:00
Fabrice Di Meglio
1714426bd2 Merge "Update Framework resources for RTL support" 2013-08-02 20:52:31 +00:00
Mathias Agopian
80ba0a6bae be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-08-02 13:49:41 -07:00
Dave Burke
aa3b0ff3e1 am 0eab98dd: am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
* commit '0eab98dd24b3a4272d5e9a41f353071f8508ec2a':
  Revert "Add version identifier to app ops."
2013-08-02 13:44:17 -07:00
Dave Burke
0eab98dd24 am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
* commit '019f4385d17234324db23521149e1f1cb6d7d061':
  Revert "Add version identifier to app ops."
2013-08-02 13:42:03 -07:00
Dave Burke
019f4385d1 am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
* commit '7925e7cc089251afb2faceb3e81eea436647c572':
  Revert "Add version identifier to app ops."
2013-08-02 13:39:12 -07:00
Dave Burke
7925e7cc08 Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 2013-08-02 20:36:28 +00:00
Chris Craik
b213cec0ce Merge "Fix quickReject's handling of AA ramp geometry" 2013-08-02 20:34:38 +00:00
Svetoslav Ganov
650f0ee31b ssss
Change-Id: I001c2ae5bc6caeac7e1a2223e221be69f6e6cb6c
2013-08-02 13:31:20 -07:00
Dave Burke
0997c5bd79 Revert "Add version identifier to app ops."
This reverts commit 483a6bbfc118409b9c46b226cf0aa6afdc4d9159.

Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
2013-08-02 20:25:02 +00:00
David Christie
03ed0127da Modify quicksettings to have new location behavior.
Location tile is always present, and long pressing
toggles the master location enabled switch.

Change-Id: I54d5ccaa3b04e14ebebd68f5fafa8e65311debb4
2013-08-02 13:10:10 -07:00
Scott Main
d53f8abcf5 add note to use "480" instead of "xxhdpi" (this should be temporary)
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
2013-08-02 12:56:43 -07:00
Glenn Kasten
83db9ed199 Clean up imports
No need to import java.lang.*;
these imports are implicit in the language.

Change-Id: Ia903fb9546f2a295605dbc80ba69c4e6778627d6
2013-08-02 12:39:51 -07:00
David Christie
0ca981fe42 Fix broken unit test
Change-Id: I4aa0035233749f6d585c151329436439ae9b2921
2013-08-02 12:33:00 -07:00
Glenn Kasten
9afc78d7ce Replace run-time PCM encodings by compile-time constants
Change-Id: I2ab9103f3666d88eb1c7292307cc0a90a6482af6
2013-08-02 12:32:32 -07:00
Glenn Kasten
844b0475ed Remove dead code in AudioTrack JNI
Change-Id: I17103485cdefdf2d1dbda8d1993e64c80d4e952e
2013-08-02 12:17:29 -07:00
Chris Craik
5e49b307eb Fix quickReject's handling of AA ramp geometry
By having quickReject round out the window-space geometry bounds, we
prevent the AA perimeter (which falls outside the local bounds passed
in) from drawing outside the clip.

Change-Id: I8ee36be9039a9c47906815ee2f0dbaa5eb910b82
2013-08-02 11:29:22 -07:00
Jeff Sharkey
aaabfe9587 Merge "Reference docs by ROOT_ID and DOC_ID; recents." 2013-08-02 18:10:09 +00:00
Jeff Sharkey
92d7e697a8 Reference docs by ROOT_ID and DOC_ID; recents.
The same document may be present with different sematics under
multiple storage roots, so always reference using both ROOT_ID and
DOC_ID.  This enables backends to revoke permissions for an entire
root, such as when an account is removed.

Start building provider to remember recently accessed documents.

Change-Id: I75befa2e61393dec12fcc7fd27f631fcddae46fa
2013-08-02 11:05:11 -07:00
David Christie
df2cab2fc4 Fix build breakage
Change-Id: Ia684fb55db301fdadaa3aae93f82b2cdcfc200af
2013-08-02 10:54:55 -07:00
Elliott Hughes
32c308a5f2 Merge "If media wants ASCII lowercasing, it needs to ask for it." 2013-08-02 17:24:41 +00:00
David Christie
474daa2b78 Merge "Add WorkSource capability to AlarmManager." 2013-08-02 17:17:38 +00:00
Elliott Hughes
dcb1a58cf9 If media wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
2013-08-02 10:03:53 -07:00
Derek Sollenberger
e242e2f236 Merge "Changes needed to support Skia at r10377." 2013-08-02 17:03:37 +00:00
Jean-Michel Trivi
045b309af7 Merge "Remove whitespace in IAudioService.aidl" 2013-08-02 17:01:26 +00:00