109407 Commits

Author SHA1 Message Date
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
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
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
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
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