42441 Commits

Author SHA1 Message Date
Chet Haase
1f99240c64 am d766d71a: am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator"
* commit 'd766d71a4ccb2d2a6966b2319f272f64fdcbfa7d':
  Return the actual interpolator of the ViewPropertyAnimator
2013-07-25 17:04:16 -07:00
Chet Haase
d766d71a4c am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator"
* commit 'd547bcec5634f99195a2b12522b6977f61c40d55':
  Return the actual interpolator of the ViewPropertyAnimator
2013-07-25 14:52:31 -07:00
Chet Haase
d547bcec56 Merge "Return the actual interpolator of the ViewPropertyAnimator" 2013-07-25 21:46:49 +00:00
Colin Cross
eb63254431 Merge "replace cutils/logger.h with log/logger.h" 2013-07-25 21:39:31 +00:00
Matthew Williams
c81891c125 Fixes to javadoc
That was breaking sdk(linux) and aosp_mips-eng (linux)

Change-Id: I1d6737baf68e004a2764d1dbee816f98a1a49be8
2013-07-25 14:27:43 -07:00
Elliott Hughes
efaad3e2c6 resolved conflicts for merge of a35ec14f to master
Change-Id: Ib2eb18fe6df2e404d0bf739b300fc200ca81f539
2013-07-25 10:36:59 -07:00
Elliott Hughes
a35ec14f78 am 03bd8324: Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation."
* commit '03bd832461d02675d5a4c6a9c072bed18e81781e':
  Switch DateUtils.formatDateRange over to an icu4c-based implementation.
2013-07-25 10:26:32 -07:00
Cyril Mottier
d40acfb89e Return the actual interpolator of the ViewPropertyAnimator
The implementation of getInterpolator() was always returning null
(probably a quick copy-paste from the default Animator implementation).
This patch fixes the problem by returning the interpolator set by
setInterpolator(TimeInterpolator) or the default one if none has been
set yet.

This patch also avoid creating multiple instances of ValueAnimator in 
order to retrieve some default values.

Change-Id: I8880f419f021a8b980fb32bebe927915fde19bf7
2013-07-25 10:08:29 +02:00
Ying Wang
8cf4e13e46 Fix docs build.
Change-Id: I5bf25f6f1681a66f63798a9a0d5112b2a32f747b
2013-07-24 20:47:19 -07:00
Baligh Uddin
f3f610b0d5 Merge "Import translations. DO NOT MERGE" 2013-07-25 02:39:04 +00:00
Todd Poynor
a9de3462a6 Add libbatteryservice AIDL and java interfaces
Add IBatteryPropertiesRegistrar and IBatteryPropertiesListener AIDLs,
BatteryProperties class.

Change-Id: Ic8e71178c02b04868eca29c3da88e877bc2590ca
2013-07-25 02:13:49 +00:00
Alan Viverette
0962ff1bce Merge "Update setAdapter() documentation for Spinner" 2013-07-25 00:32:27 +00:00
Zhihai Xu
e1280dd5d9 Merge "Bluetooth stopped working in master - "bad file descriptor"" 2013-07-25 00:21:12 +00:00
Colin Cross
44bc186649 replace cutils/logger.h with log/logger.h
and remove it from files that don't use it.

Change-Id: Ieb44a3f1f75c2d2b277f0d01ca926a92211e3fe6
2013-07-24 23:44:45 +00:00
Alan Viverette
a089ddecaf Update setAdapter() documentation for Spinner
BUG: 9906193
Change-Id: Id21ee957cb72c9452b150a713ed37adb0fa82d30
2013-07-24 16:38:37 -07:00
Alan Viverette
0e14060bc6 Merge "Use clearFocus() when entering touch mode" 2013-07-24 23:34:35 +00:00
Alan Viverette
ed7821a60c Use clearFocus() when entering touch mode
Calling unFocus() leaves the view hierarchy in an inconsistent
state. This is okay in ViewGroup, where the state is manually
updated, but causes issues in ViewRootImpl.

BUG: 9983358
Change-Id: Id63e62962d895e6bd4f816f202dcf77254ceab4e
2013-07-24 15:49:23 -07:00
Matthew Williams
f7e843e3a2 Merge "AnonymousSyncService & SyncRequest." 2013-07-24 22:41:22 +00:00
Glenn Kasten
1bd84bd3d5 Merge "Rename mChannels to mChannelMask to avoid ambiguity" 2013-07-24 22:35:11 +00:00
Matthew Williams
fa77418134 AnonymousSyncService & SyncRequest.
Changes to the way bundles are parcelled broke SM,
this update writes out the bundle as xml. This circumvents
the need for parcel, and makes it easier to debug whats
happening.
Change-Id: I6cd5d3a2eb80bfa5b3ae0c7f2d2ff91a65daaa34
2013-07-24 15:25:29 -07:00
Zhihai Xu
df3cedab6f Bluetooth stopped working in master - "bad file descriptor"
ignore IllegalArgumentException in BluetoothSocket.close().

bug: 9960585
Change-Id: I301aa388b738dcb92b643fdd96b5c9cb6f8b3efe
2013-07-24 15:09:45 -07:00
Elliott Hughes
6139e64cd6 Switch DateUtils.formatDateRange over to an icu4c-based implementation.
Bug: 7289514
Change-Id: Ia382f49aa23737bde91b7891d95545da084ec57c
2013-07-24 14:46:31 -07:00
Zhijun He
3f9a609050 Merge "camera2: Implement CameraDevice#waitUntilIdle" 2013-07-24 20:56:31 +00:00
Glenn Kasten
33c437df39 Rename mChannels to mChannelMask to avoid ambiguity
This clarifies that it's a channel mask, as opposed to a count.

Also no need to initialize the field in the declaration,
as it's initialized in the constructor.

Include channel mask in error logs.

Change-Id: Ifc02668cf922dc8826a9fb042b3ca52fad377ba6
2013-07-24 12:20:52 -07:00
Alan Viverette
87c79a18fe Merge "Add secure settings for captions" 2013-07-24 18:16:16 +00:00
Baligh Uddin
43c8ff5e04 Import translations. DO NOT MERGE
Change-Id: I35fc69b5ca2cd9442dd4e88da6c48fb70dc64940
Auto-generated-cl: translation import
2013-07-24 09:29:43 -07: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
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
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
Amith Yamasani
dc56ceb6a1 Merge "New permission to manage device admins" 2013-07-24 00:06:34 +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
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
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
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
Geremy Condra
5830e07521 Merge "Fix supplimentary network connections with VPNs" 2013-07-23 17:58:33 +00:00
Geremy Condra
1b6868cc4b Merge "Support multiple Vpn ManageDialogs" 2013-07-23 17:55:45 +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