109601 Commits

Author SHA1 Message Date
Craig Mautner
7aee681b6b Merge "Set task and activity types when adding to task." 2013-07-23 22:48:52 +00:00
Joe Fernandez
b5c29e75a0 docs: OpenGL ES 3.0 dev guide update
Change-Id: I46b9aee4c6b31e1ac6148f79b8607292b04f69c6
2013-07-23 15:48:30 -07:00
Martijn Coenen
7ea1ab60b0 Merge "Re-use "name" attribute for NFC AIDs." 2013-07-23 22:27:05 +00:00
Alan Viverette
eb2fded0d3 Merge "Fix handling of ListPreference.setValue()" 2013-07-23 22:16:56 +00:00
Alan Viverette
94c02a1a1a Fix handling of ListPreference.setValue()
Previously, setValue() was not calling notifyChanged(). This
prevented the summary from updating correctly. Now it calls
notifyChanged() the first time it's called and when the value
actually changes.

BUG: 9987962
Change-Id: I02dd4be6bde2969f39d30921a62a7ba908128e0e
2013-07-23 14:43:37 -07:00
Scott Greenwald
9a05b31aab Add support for notification scorers.
This CL adds an interface and classes for scoring notifications.
The NotificationManagerService initializes an array of scorers
specified as a resource. When a Notification is enqueued, the
getScore() method is called successively on the scorers, each
getting the Notification to be scored, and the score outputted
by the previous scorer. At present there is a single scorer
which prioritizes Notifications that mention the display name of
a starred contact.

To turn off the StarredContactNotificationScorer:
  adb shell settings put global contact_scorer_enabled 0

Change-Id: Ic16c80952e7c85bdde292ebb3f7900efb01f2e29
2013-07-23 17:16:51 -04:00
Alan Viverette
ef79380d2f Add secure settings for captions
BUG: 9926077
Change-Id: I202aef88943e1f884e5bd4c112f081b8b4b76ada
2013-07-23 14:15:28 -07:00
Chris Craik
9c2cde0583 Use IllegaleStateException to be consistent with rest of Bitmap class
Change-Id: Idd1c77f92eafa8a43619d27a9567382447540e5f
2013-07-23 14:14:45 -07:00
Scott Main
ef43b7617c am 2edf372e: fix javadoc error
* commit '2edf372ed2a7f6e640591dbb76b429eecd5e31d0':
  fix javadoc error
2013-07-23 13:55:20 -07:00
Michael Wright
b1f5585f89 Merge "Add controller numbers for gamepads / joysticks" 2013-07-23 20:52:57 +00:00
Scott Main
2edf372ed2 fix javadoc error
Change-Id: Ieae3e73cda9541e774626fbd73100cdadc1513ad
2013-07-23 13:52:05 -07:00
Michael Wright
ac6c78b6ee Add controller numbers for gamepads / joysticks
Change-Id: I30ac9add6a2473a5ebd83a022c571545e61d1136
2013-07-23 13:50:10 -07:00
Zhijun He
7f4d3147d1 camera2: Implement CameraDevice#waitUntilIdle
Also cleanup some logging/comments.

Change-Id: Id1a4dd853519802a2b74b8d2172095ba388329e6
2013-07-23 13:46:37 -07:00
Scott Main
9460f4072a update usb driver doc with download link;
delete revision notes

Change-Id: I325137a026ea99cb2cd5d5f4689a9c1ee5942a92
2013-07-23 13:41:38 -07:00
Glenn Kasten
922a8c0aa8 Merge "Use switch in callback handler for events, and no EVENT_MORE_DATA" 2013-07-23 20:36:07 +00:00
Scott Main
a73fb627dc am 3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit '3dee8aaf17c9e383afe91a30eff1aa7c1f8fed69':
  update action bar guide for support lib ABC
2013-07-23 13:22:44 -07:00
Scott Main
3dee8aaf17 Merge "update action bar guide for support lib ABC" into jb-mr2-dev 2013-07-23 20:21:13 +00:00
Craig Mautner
2c1faed412 Set task and activity types when adding to task.
Activities from the home package were causing tasks types to change from
application to home. This was not the intention of setting the task type
when adding an activity. This change sets the task type to the inherent
type of the first activity added. All subsequent activities added to the
task then inherent the task's type overriding the inherent type of the
task.

Fixes bug 9972495.

Change-Id: Ib77675aea790ea64d4f166af62c7138e89356c13
2013-07-23 13:15:37 -07:00
Chris Wren
270d1460d3 Merge "allow rich notifications in the heads up." 2013-07-23 20:13:35 +00:00
Romain Guy
f9fe31d460 Merge "Fix crash in app widgets Bug #9983130" 2013-07-23 20:11:09 +00:00
Romain Guy
9870e5ca00 Fix crash in app widgets
Bug #9983130

Change-Id: Ie2319c9e8f6e7591c03061224021973b94ae07cb
2013-07-23 13:09:51 -07:00
Dirk Dougherty
1a78bc5a01 am 369d1980: am 9aaa8f30: am 0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '369d1980b9a3a31111c5c993d7cab289b511f835':
  Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:47:54 -07:00
Dirk Dougherty
369d1980b9 am 9aaa8f30: am 0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '9aaa8f30393413a5a52c4494146b35de3124d8a0':
  Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:45:37 -07:00
Dirk Dougherty
9aaa8f3039 am 0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '0acf946bb4968416d123ced337d8bb42eb17df8b':
  Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:42:19 -07:00
Dirk Dougherty
0acf946bb4 Doc change: Add Colopl video to carousel and spotlight.
cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93

Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:33:06 -07:00
Scott Main
e04c454302 update action bar guide for support lib ABC
Change-Id: Ie4594b3a0e0a686ed37d858788c7c747a1ee09e0
2013-07-23 12:17:05 -07:00
Dianne Hackborn
57a7f5954c Add "adb shell am restart" command.
So you can restart the system without being root.

Change-Id: I89770f497833ecbe2b69e3a0cfafae7ef472a9f5
2013-07-23 11:51:22 -07:00
Dianne Hackborn
5cf6663c80 Merge "Add new facility for apps to declared their preferred intents." 2013-07-23 18:30:18 +00:00
Stan Chesnutt
9a3552bfca Merge "switch to v3 for NetworkLocator overlay, compatible with gcore FINN" 2013-07-23 18:00:25 +00:00
Geremy Condra
5830e07521 Merge "Fix supplimentary network connections with VPNs" 2013-07-23 17:58:33 +00:00
Craig Mautner
b816bedf6f Limit TYPE_SYSTEM_ERROR to system decor bounds.
Because windows of TYPE_SYTEM_ERROR lie in a layer above the
Navigation Bar they cannot be allowed to extend into the Navigation
Bar area or it will block touches to the Home button.

Fixes bug 9626315

Change-Id: Ib5e4a2d2954cb79adc98d69e3c43108cb1389cc9
2013-07-23 10:56:16 -07:00
Geremy Condra
1b6868cc4b Merge "Support multiple Vpn ManageDialogs" 2013-07-23 17:55:45 +00:00
Zhijun He
a874c6762d Merge "MediaFrameworkTest: Fix camera unit test failure" 2013-07-23 17:33:51 +00:00
Glenn Kasten
5bae9df4e8 Merge "Replace run-time PCM encodings by compile-time constants" 2013-07-23 17:32:10 +00:00
Glenn Kasten
6824a143c9 Merge "Remove unused includes" 2013-07-23 17:01:54 +00:00
Glenn Kasten
369dbf9a66 Merge "Use the utility logging methods and single tag" 2013-07-23 16:26:01 +00:00
Amith Yamasani
9dade39ec3 Merge "User restriction API to disable single-user restrictions feature." 2013-07-23 16:21:48 +00:00
Jean-Michel Trivi
2352228ff1 Merge "Launch voice-based searches as current user" 2013-07-23 16:20:26 +00:00
Jean-Michel Trivi
9020316ea3 Merge "Fix dump formatting of RemoteControlClient playback state dump" 2013-07-23 16:18:58 +00:00
Amith Yamasani
0343ec3abb User restriction API to disable single-user restrictions feature.
Change-Id: I80e08b38b5e32f3cb1af51398907510508ec199f
2013-07-23 09:17:21 -07:00
Glenn Kasten
4afca0cc90 Merge "Detect integer overflow" 2013-07-23 15:52:31 +00:00
Baligh Uddin
7b854fcc6e Merge "Import translations. DO NOT MERGE" 2013-07-23 15:39:46 +00:00
Chris Wren
51c7510e49 allow rich notifications in the heads up.
new shouldInterrupt logic: screen on, not locked, not dreaming, and
  priority above HIGH and noisy, or has fullscreen intent
draft of API allowing devs to give hints about head up display

reuse inflateViews()
add an expand helper to the heads up space
move some things into Entry for reuse

don't allow touches in first second
delay decay if touched
make decay time a resource

add a custom viewgroup for notification rows to get view management
out of the NotificationData class.

Change-Id: I36464f110cfa0dabc3f35db7db6c35c27e8ee2ba
2013-07-23 11:38:56 -04:00
Glenn Kasten
4e693f558f Merge "Verify that AudioRecord object is initialized for more APIs" 2013-07-23 15:22:39 +00:00
Glenn Kasten
7fc7230787 Merge "Remove redundant AudioRecord. qualifiers" 2013-07-23 15:03:14 +00:00
Glenn Kasten
004f2b7835 Merge "Return the record state locked" 2013-07-23 14:51:30 +00:00
Glenn Kasten
9ad3afe52e Merge "Return correct status for android.media.AudioRecord.read(short[]...)" 2013-07-23 14:32:27 +00:00
Ben Murdoch
597256e128 Update WebView.loadDataWithBaseURL documentation.
Clarify behavior around base URLs with data: vs. non-data: schemes.

Bug: 9894754
Change-Id: I335253c07a13f3d4a5485b6ff11e53bd1580a890
2013-07-23 15:15:21 +01:00
Martijn Coenen
434249ef62 Re-use "name" attribute for NFC AIDs.
Change-Id: I92895e0f21a639897c45ec184580c43ba8b22dca
2013-07-22 19:47:57 -07:00
Zhijun He
229019e6af MediaFrameworkTest: Fix camera unit test failure
Fix for testSubmitStreamingRequest failure

Change-Id: I2e22a56b3da90112a668c2185b05eb9288cde392
2013-07-22 18:08:30 -07:00