Lajos Molnar
51bf5d9c07
Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
2015-05-14 21:17:31 +00:00
Lajos Molnar
af0479446b
Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
2015-05-14 21:17:30 +00:00
Chien-Yu Chen
3b7bc569e6
Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
2015-05-14 20:46:38 +00:00
Mikhail Naganov
6162eafe7a
Tiny fix after updating the error reporting API
...
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.
Bug: 20064008, 21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
2015-05-14 13:30:13 -07:00
Lajos Molnar
05a822161f
media: change final fields to accessors in MediaTimestamp
...
Bug: 20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
2015-05-14 12:17:40 -07:00
Lajos Molnar
dbc908fba8
media: remove setPlaybackRate from MediaPlayer and MediSync
...
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.
Bug: 21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
2015-05-14 12:16:44 -07:00
Robin Lee
3c1b55f1d6
am af1985b3: am f8bb8595: am 39087b1c: Replace String host:port/url args with Uri arg
...
* commit 'af1985b3170f9c49353457f60d708a1826e37635':
Replace String host:port/url args with Uri arg
2015-05-14 18:04:18 +00:00
Yorke Lee
0125d76fa3
Merge "Make Conferenceable an abstract class" into mnc-dev
2015-05-14 17:32:45 +00:00
Dan Sandler
02cd9f91a6
Use Context instead of Resources in Icon.createWithResource.
...
This works around situations where corrupted packages cause
Resources.getResourcePackageName to return something that
does't actually work.
Bug: 21144636
Change-Id: I271518599a8eb89d493f1ceda6cb2e47fb38a4ff
2015-05-14 13:23:12 -04:00
Daniel Sandler
9cb90cbbf8
Merge "Revert "Icon support comes to Notification."" into mnc-dev
2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f
Revert "Icon support comes to Notification."
...
This reverts commit 08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit 5bcbf857d129f4513e562801a4e88077b2655ade.
Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
2015-05-14 12:23:24 -04:00
Paul McLean
f799491fb4
Merge "New policy for internal and wired device names." into mnc-dev
2015-05-14 15:59:38 +00:00
Michael Wright
1b2e5c11b6
Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
2015-05-14 15:31:14 +00:00
Zoltan Szatmary-Ban
39b8c69a23
Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
2015-05-14 15:13:34 +00:00
Michael Wright
5bd69e6e61
Revert "Revert "Add new MotionEvent actions for button press and release.""
...
This reverts commit 96238051621ba2dc8a1c20fa48a00ec6ec4735d6.
2015-05-14 14:48:08 +01:00
Michael Wright
3d52869834
Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
2015-05-14 13:47:10 +00:00
Michael Wright
9623805162
Revert "Add new MotionEvent actions for button press and release."
...
This reverts commit ec0ce51b733f10c620cb9447b074f022d042e31d.
2015-05-14 14:46:25 +01:00
Michael Wright
07b83f1c9e
Merge "Add new MotionEvent actions for button press and release." into mnc-dev
2015-05-14 13:31:29 +00:00
Michael Wright
ec0ce51b73
Add new MotionEvent actions for button press and release.
...
Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.
Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.
Bug: 20704355
Change-Id: I5b75e5c5e692171c1c117ee687dd185a0d9dd15c
2015-05-14 14:18:05 +01:00
Dan Sandler
ac3a137170
am 9349eb56: am 6da734c6: am 08a04c15: Icon support comes to Notification.
...
* commit '9349eb5640d1a381574a6f871a96e89ba3074d27':
Icon support comes to Notification.
2015-05-14 06:55:01 +00:00
Dan Sandler
d91129003c
am 38b00300: am 96952c74: am a22a380f: Add Icon support to ImageView.
...
* commit '38b003001ace5ddc354b483dc37793c3ceeaf34b':
Add Icon support to ImageView.
2015-05-14 06:54:54 +00:00
Andy Hung
26a80fdd03
am cbd1596d: am c2aa3557: am 2bdd69c4: Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev
...
* commit 'cbd1596d857ef766a297cf394349050d157bf4d1':
Add getChannelIndexMasks API to AudioDeviceInfo
2015-05-14 06:54:15 +00:00
Robin Lee
39087b1cec
Replace String host:port/url args with Uri arg
...
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.
Bug: 20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
2015-05-14 07:15:18 +01:00
Dan Sandler
08a04c1524
Icon support comes to Notification.
...
And you may ask yourself: what is that beautiful icon?
And you may ask yourself: where does that API go to?
And you may ask yourself: is it a resource? is it a Bitmap?
And you may say to yourself: my god, what have I done
Bug: 18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
2015-05-13 23:50:43 -04:00
Dan Sandler
a22a380fbb
Add Icon support to ImageView.
...
ImageView.setImageIcon() is remotable, so you can also call
RemoteViews.setImageViewIcon().
Bug: 18568715
Change-Id: I456cfa65102e1983d3392d822584d154a6cd761a
2015-05-13 23:50:39 -04:00
Yorke Lee
abfcfdc044
Make Conferenceable an abstract class
...
Bug: 21066017
Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
2015-05-13 20:48:19 -07:00
Santos Cordon
d7d11889f2
am cf8172ef: am 13cad861: am d9e1fe3c: Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev
...
* commit 'cf8172ef66fd0dffb92af43a0268d5825bfaed8c':
[1/4] Use new Icon class in PhoneAccount.
2015-05-14 02:38:37 +00:00
Yorke Lee
4d78a792f6
am 0cc30270: am 606e9e1c: am ad0bfe3a: Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev
...
* commit '0cc30270274cfab889d0f710a426e95911824355':
Add BIND_TELECOM_CONNECTION_SERVICE permission
2015-05-14 02:38:32 +00:00
Svetoslav
b90096a83f
am 80dcc684: am d5d58a7d: am 857c3019: Merge "Do not allow opting out from the new permission model." into mnc-dev
...
* commit '80dcc684a4ee0bbaceac8c0417e425529724172d':
Do not allow opting out from the new permission model.
2015-05-14 02:38:26 +00:00
Mikhail Naganov
2b8fc9d72c
am d944bf37: am 16bfbbba: am 822f1aaf: Merge "Update the new error reporting API in android.webkit" into mnc-dev
...
* commit 'd944bf37028081bebc4d90549049b146484ba161':
Update the new error reporting API in android.webkit
2015-05-14 02:20:43 +00:00
Andy Hung
2bdd69c4a2
Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev
2015-05-14 02:18:02 +00:00
Santos Cordon
d9e1fe3cd4
Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev
2015-05-14 02:07:58 +00:00
Yorke Lee
ad0bfe3ae2
Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev
2015-05-14 02:06:54 +00:00
Svetoslav
857c3019ba
Merge "Do not allow opting out from the new permission model." into mnc-dev
2015-05-14 02:04:30 +00:00
Yorke Lee
972894013e
am d7e2bb68: am 20fcb1f7: am e01f9355: Merge "Rename AudioState to CallAudioState" into mnc-dev
...
* commit 'd7e2bb6876304a753fd645c100fb3f5e79bb61b1':
Rename AudioState to CallAudioState
2015-05-14 02:01:19 +00:00
Dianne Hackborn
3b697d7926
am 152313b5: am fb84c7e7: am 6495ef97: Merge "Fix build." into mnc-dev
...
* commit '152313b5f837783832e81dbba05116496c235924':
Fix build.
2015-05-14 02:00:51 +00:00
Svetoslav
d965370398
Do not allow opting out from the new permission model.
...
bug:20525775
Change-Id: I84cd4587db5adb96f6f29148adb242905f53f2dc
2015-05-13 18:54:57 -07:00
Mikhail Naganov
822f1aaf2b
Merge "Update the new error reporting API in android.webkit" into mnc-dev
2015-05-14 01:43:48 +00:00
Mikhail Naganov
8d4f07f8d3
Update the new error reporting API in android.webkit
...
- minor changes in WebResourceError;
- prepare to remove WebResourceResponseBase;
- add immutable mode to WebResourceResponse.
Bug: 21063767
Change-Id: Iaf5f92e3850732c7a888453468e108809b3b782a
2015-05-13 18:40:20 -07:00
Andy Hung
bece0c7a1d
Add getChannelIndexMasks API to AudioDeviceInfo
...
Fix some javadoc as well.
Bug: 21129531
Change-Id: I82e5b66f254f6acdcd93638eeed878b4c5b5be34
2015-05-13 18:33:28 -07:00
Yorke Lee
e01f93557d
Merge "Rename AudioState to CallAudioState" into mnc-dev
2015-05-14 01:21:16 +00:00
Svet Ganov
4ec301faac
am 59a49c03: am a82e4878: am 67b7ec28: Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
...
* commit '59a49c0309e9cec01e33be07de74e3c530efa07f':
Access mock location is no longer a runtime permission - framework
2015-05-14 01:01:09 +00:00
Robert Shih
088bd9e37b
am 27804d8d: am c0d6679a: am 55e6ad78: Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev
...
* commit '27804d8d55503466acf01a2bc569d8395d35f27d':
MediaPlayer/TimedMetaData: API updates related to timed metadata
2015-05-14 01:01:02 +00:00
Ihab Awad
d476401d6b
am edb9f811: am 1504dd68: am 24145d45: Merge "Refactor StatusHints (1/3)" into mnc-dev
...
* commit 'edb9f811b6963c4b4628de6c84bcc0f76c24e5e8':
Refactor StatusHints (1/3)
2015-05-14 01:00:40 +00:00
Dianne Hackborn
4be8c4cc4c
Fix build.
...
Change-Id: I94c7e3033721c1d8024a212614752512e685289b
2015-05-13 17:35:42 -07:00
Santos Cordon
cad84a2070
[1/4] Use new Icon class in PhoneAccount.
...
Bug: 21088522
Change-Id: Ia03171d4861f758701e89733f4082863587e8c11
2015-05-13 16:57:48 -07:00
Svet Ganov
67b7ec2887
Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
2015-05-13 23:45:23 +00:00
Lajos Molnar
f72d395366
am c7800e12: am a09c08ff: am 907d8afd: Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev
...
* commit 'c7800e12af636010c2609195298946ac3064e719':
media: rename MediaCodec.setSurface to setOutputSurface
2015-05-13 23:39:28 +00:00
Robert Shih
55e6ad78a0
Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev
2015-05-13 23:36:51 +00:00
Ihab Awad
24145d451b
Merge "Refactor StatusHints (1/3)" into mnc-dev
2015-05-13 23:26:05 +00:00