109421 Commits

Author SHA1 Message Date
Glenn Kasten
44097837df Merge "Match AudioRecord.getChannelConfiguration docs" 2013-07-24 22:30:20 +00:00
Jim Miller
fca3193bbe Merge "Fix layout incompatibility between hdpi vs xhdpi devices" 2013-07-24 21:14:09 +00:00
Chris Craik
6b8e13b714 Merge "Use IllegaleStateException to be consistent with rest of Bitmap class" 2013-07-24 21:01:57 +00:00
Zhijun He
3f9a609050 Merge "camera2: Implement CameraDevice#waitUntilIdle" 2013-07-24 20:56:31 +00:00
Jim Miller
c95e5c844a Fix layout incompatibility between hdpi vs xhdpi devices
The xhdpi was using the hdpi spec instead of the default since
it was the closest match.

This allows both devices to work correctly.

Fixes bug 9985496

Change-Id: I03ddf1b6645d5f82e2fba6c39a1c5b3a37e62d45
2013-07-24 13:27:51 -07:00
Christopher Tate
616dfe37f5 Merge "Don't let batch coalescing / rewindowing break batch ordering" 2013-07-24 19:47:59 +00:00
Romain Guy
fb6c743c6e Merge "Fix 9patches' limitation of 32 empty quads" 2013-07-24 18:54:11 +00:00
Romain Guy
6cad75744e Fix 9patches' limitation of 32 empty quads
The 9patch format allows to define more empty quads than this, remove
the use of a single int to index empty quads and replace it with a
lookup in the 9patch resource data structure.

Change-Id: I148ee5d9e0c96822b534a344e15c9d88078db7c2
2013-07-24 11:49:33 -07:00
Glenn Kasten
d5af238199 Match AudioRecord.getChannelConfiguration docs
Bug: 10001767
Change-Id: I28705ae84ee585afc37cdd2b13a039b7bfc36543
2013-07-24 11:43:32 -07:00
Alan Viverette
87c79a18fe Merge "Add secure settings for captions" 2013-07-24 18:16:16 +00:00
Colin Cross
e8b68c45f8 Merge "add static dependency on liblog" 2013-07-24 17:53:40 +00:00
Dianne Hackborn
530a7fd844 Merge "Fix another problem with procstats bucketing." 2013-07-24 17:52:58 +00:00
Ben Murdoch
b8fc83f3ac Merge "Update WebView.loadDataWithBaseURL documentation." 2013-07-24 09:24:05 +00:00
Kenny Root
e79b9280f0 Merge "Use hostname verifier directly instead of instance" 2013-07-24 06:51:29 +00:00
Kenny Root
ba23a6677e Exclude magic inner-class name from preload
Add a magic subclass name that will exclude inner classes that are meant
to prevent object instatiation but allow class preloading. This will
allow classes that have undesired side-effects to delay initialization
until the side-effects are no longer disruptive.

Bug: 9984058
Change-Id: I46b0784760d84a2a2da1f9f41d87ee7f70a3fc16
2013-07-23 22:37:37 -07:00
Kenny Root
928ee1e48f Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

Bug: 9984058
Change-Id: I780249dbd3c7bb346e1b275dcb68e4e2be7ebbbb
2013-07-23 20:46:24 -07:00
Dianne Hackborn
85df4e0c1c Fix another problem with procstats bucketing.
We were now propagating the screen on state when updating
all process states, so they would get pushed into the screen
off bucket always even if the screen was on.  Oops!

Also improve the summary output when dumping a single package
to be more summary-like.

Change-Id: I16c640f9dc02d6db8c66aeb1c720f67beab60635
2013-07-23 19:15:27 -07:00
Christopher Tate
385e49805e Don't let batch coalescing / rewindowing break batch ordering
Bug 9965704

Change-Id: I41819bd1da16cc61c54938ed4ddd421f15b56fbb
2013-07-23 18:55:20 -07:00
David Christie
3de52c67e5 Merge "Add WorkSource capability to LocationManager" 2013-07-24 01:37:36 +00:00
Svetoslav Ganov
4a1e24ce9d Merge "Updating the print dialog and its interactinos with the printing app." 2013-07-24 01:13:01 +00:00
Svetoslav Ganov
0d1daa50f6 Updating the print dialog and its interactinos with the printing app.
1. Added support for reporting the old print attributes during layout.
   Now we keep track of the old print attributes, so the app can
   compute the delta and decide whether re-layout work is needed.

2. Fixed PrintDocumentAdapter callback interleavings. Layout callbacks
   were intermixing with write ones - a mess. Now we make an attempt
   to cancel layout and write if they respond to cancellation, otherwise
   we wait but do not interleave them.

3. Refactored the PrintJobConfigActivity for easier maintenance and
   to have a single update UI method that does the minimal amount
   of work.

Change-Id: I31ada1a0550882e6185018e6f17f923aed165d15
2013-07-23 18:05:53 -07:00
Colin Cross
0d6e7315eb add static dependency on liblog
Change-Id: I8056aa744b37ef0c31229329a0de79c58c5955ea
2013-07-23 18:04:24 -07:00
Geremy Condra
46a7b0d1aa Merge "Fix default DNS not being set on network changes" 2013-07-24 00:32:34 +00:00
Dianne Hackborn
eb54cc7eed Merge "Fix bug that was causing us to lose total memory buckets." 2013-07-24 00:31:27 +00:00
Dianne Hackborn
bd754f44cd Fix bug that was causing us to lose total memory buckets.
When safely resetting stats after committing them, we were
mistakenly clearing the current memory state so we would lose
that total memory time until the memory state changes again.

Also improve the summary output to print percentages, which
make more sense for that display.

Change-Id: I0fe45fd78e97ec8b94976170dd42f4ed345a5899
2013-07-23 17:30:30 -07:00
Chad Brubaker
20a7e881da Fix default DNS not being set on network changes
Change-Id: I3c45404cab34c77b20dadc1d8aee127aa08fd0bd
2013-07-23 17:13:36 -07:00
Amith Yamasani
dc56ceb6a1 Merge "New permission to manage device admins" 2013-07-24 00:06:34 +00:00
Craig Mautner
e58bb04470 Merge "Limit TYPE_SYSTEM_ERROR to system decor bounds." 2013-07-23 23:29:47 +00:00
Craig Mautner
7aee681b6b Merge "Set task and activity types when adding to task." 2013-07-23 22:48:52 +00: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
Michael Wright
b1f5585f89 Merge "Add controller numbers for gamepads / joysticks" 2013-07-23 20:52:57 +00: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
Glenn Kasten
922a8c0aa8 Merge "Use switch in callback handler for events, and no EVENT_MORE_DATA" 2013-07-23 20:36:07 +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
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