Commit Graph

13949 Commits

Author SHA1 Message Date
Mady Mellor
3baaea4e5e Merge "Add Samsung print recommendation plugin." into nyc-dev am: b4a45472bb am: 8bfb5b971d
am: 27f54d6001

* commit '27f54d600109a68c6bf42848118448f1d59727e1':
  Changes based on API council feedback for performContextClick

Change-Id: I86569c06e5b587ddd9172e4e8e2d8efa98f209d4
2016-05-25 19:22:06 +00:00
Philip P. Moltmann
27f54d6001 Merge "Add Samsung print recommendation plugin." into nyc-dev am: b4a45472bb
am: 8bfb5b971d

* commit '8bfb5b971d46daecf72c7c8e179279fb9206ad00':
  Changes based on API council feedback for performContextClick

Change-Id: I8317e028e1bd65ddf2ceb5c36b6db2fdb763f986
2016-05-25 19:14:24 +00:00
Mady Mellor
8bfb5b971d Merge "Changes based on API council feedback for performContextClick" into nyc-dev
am: 7c17e70f2f

* commit '7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
  Changes based on API council feedback for performContextClick

Change-Id: Ibf53f8081db8b847d18eaa8fee983b677b62f9bc
2016-05-25 19:08:17 +00:00
Mady Mellor
7c17e70f2f Merge "Changes based on API council feedback for performContextClick" into nyc-dev 2016-05-25 19:00:08 +00:00
Chris Banes
ba0029c56f Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f am: def151052c
am: f34dec952e

* commit 'f34dec952eebe2d591cfd2f84f9c6a46ced39dca':
  Fix text appearances not working in colored button styles

Change-Id: I1e57c83ba59c6394a45de292d65de5735547a21f
2016-05-25 18:36:26 +00:00
Chris Banes
f34dec952e Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f
am: def151052c

* commit 'def151052c2e48a3f0e8de8dbab65db4e953abeb':
  Fix text appearances not working in colored button styles

Change-Id: I3f47630eaf5bc2893b845ad141087d2a2a7011f5
2016-05-25 18:20:27 +00:00
Chris Banes
def151052c Merge "Fix text appearances not working in colored button styles" into nyc-dev
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: I229589acdd58746f4a230643ae025fa4639a7991
2016-05-25 18:05:52 +00:00
Chris Banes
163236156f Merge "Fix text appearances not working in colored button styles" into nyc-dev 2016-05-25 17:57:12 +00:00
Julia Reynolds
847007297b Merge changes from topic \'cps\' into nyc-dev am: d3827be162 am: 5bf51f026c
am: 88be37e50a

* commit '88be37e50a9a1fce703a95d9fb90b975de06a286':
  Api updates.
  Note timezone changes.

Change-Id: I01c59a43b65c51a3968d16f6791c703fd495be5e
2016-05-25 17:36:19 +00:00
Julia Reynolds
88be37e50a Merge changes from topic \'cps\' into nyc-dev am: d3827be162
am: 5bf51f026c

* commit '5bf51f026cddca00b156f93089cb803e4c612d96':
  Api updates.
  Note timezone changes.

Change-Id: Ic175b68e0c8000c1fe613f0e213631d7e1275f2d
2016-05-25 17:21:58 +00:00
Julia Reynolds
39c013811e Merge changes from topic \'cps\' into nyc-dev
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: I52055d3a5193bed6392327bd5df82dc7880c5ce7
2016-05-25 17:16:01 +00:00
Julia Reynolds
5bf51f026c Merge changes from topic \'cps\' into nyc-dev
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
2016-05-25 17:15:07 +00:00
Julia Reynolds
ad41a6f0de Api updates.
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
2016-05-25 13:02:50 -04:00
Mady Mellor
4f3ab93147 Changes based on API council feedback for performContextClick
Added an overloaded version with (float x, float y).

Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
2016-05-25 09:52:51 -07:00
Chris Banes
ec39b57e6f Fix text appearances not working in colored button styles
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.

BUG: 28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
2016-05-25 16:49:43 +00:00
Jean-Michel Trivi
3109da2e8b Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 30979c2c76
am: 1e34fb313b

* commit '1e34fb313b3aec0961f598265a13d444ba149766':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I09972d0abc1488ff324e9bca9750923cfa8f9e51
2016-05-24 21:35:17 +00:00
Jean-Michel Trivi
1e34fb313b Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a
am: 30979c2c76

* commit '30979c2c765a647b85e98691e517bb3d4d395668':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I250ba004e8389be3b98151f7173cf729a6c386d0
2016-05-24 21:31:14 +00:00
Jean-Michel Trivi
2c5efb4827 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I1211c2411d052762d95896c0e22661bd718c3039
2016-05-24 21:24:03 +00:00
Jean-Michel Trivi
30979c2c76 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I5842a7067c383d30f610c72c3511a4dfeb90540c
2016-05-24 21:23:29 +00:00
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00
Lajos Molnar
762db297f7 Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 674262b7e1
am: cb86750595

* commit 'cb86750595879dcf633f2bcd630831116904c5db':
  media: unhide codec levels

Change-Id: Ie55028a97f05d5d8957dcf39828a45c3747a71a9
2016-05-24 19:21:49 +00:00
Lajos Molnar
cb86750595 Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f
am: 674262b7e1

* commit '674262b7e14e0837464731f0150450a4d57ec58c':
  media: unhide codec levels

Change-Id: I226686f6b7215422878e35254eba26c81485f4e1
2016-05-24 19:12:45 +00:00
Jean-Michel Trivi
602dc777c5 Remove deprecated AudioManager.AudioRecordingCallback method
Remove AudioRecordingCallback.onRecordingConfigChanged(
         AudioRecordingConfiguration[] configs)

Bug 28819230

Change-Id: I3b85bb9313267499ac407099939b5889bdba996b
2016-05-24 12:11:59 -07:00
Lajos Molnar
4493049a88 Merge "media: unhide codec levels" into nyc-dev
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: I5a0253e8f8fe65551dadf8b3b024224fedd1042d
2016-05-24 18:56:32 +00:00
Lajos Molnar
674262b7e1 Merge "media: unhide codec levels" into nyc-dev
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: Ia2c706fe3dda13f759f54d769bac6c9fe6f34587
2016-05-24 18:56:30 +00:00
Eric Laurent
a65262e9a9 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34 am: 50103561d2
am: 45309a4a95

* commit '45309a4a950a0c46f8933481e22c16f1d618db4d':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I9da5a69426b790bbf4a0c6a22ae894b7f1258220
2016-05-24 18:02:25 +00:00
Eric Laurent
45309a4a95 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34
am: 50103561d2

* commit '50103561d24dfa2b0c2d7e64b719d43351505ca3':
  Fix AudioTrack and AudioRecord documentation

Change-Id: Iaab599f5e3c9edf1cf127264a7602f463dc219c5
2016-05-24 17:43:36 +00:00
Eric Laurent
a30335698c Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I861c0047b33730465c3ceeae1c4072f17b29d804
2016-05-24 17:43:34 +00:00
Eric Laurent
50103561d2 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I2fe322e51f6a7dc548d8f7964fae033b14219b02
2016-05-24 17:33:13 +00:00
Lajos Molnar
6c2e08083a media: unhide codec levels
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
2016-05-24 10:24:47 -07:00
Eric Laurent
b143e3de34 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 2016-05-24 17:15:11 +00:00
Eric Laurent
219de73da2 Fix AudioTrack and AudioRecord documentation
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
2016-05-23 17:36:43 -07:00
Adrian Roos
8406ea9c7b Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 80c470bd52
am: ddaa2e1fec

* commit 'ddaa2e1fec45287f7099120f0b6e75aed9e4c10d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: Iaea682e2a45c35d9114466d010c98c120e8847c9
2016-05-23 23:38:16 +00:00
Adrian Roos
ddaa2e1fec Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
2016-05-23 23:23:40 +00:00
Adrian Roos
6d2e1e45f0 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
2016-05-23 23:15:29 +00:00
Adrian Roos
80c470bd52 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
2016-05-23 23:14:35 +00:00
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Jean-Michel Trivi
2941387f5c Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: f2c8fb8620
am: 740c0424f0

* commit '740c0424f0a817746c6071942a6563a603649697':
  Recording activity notification: return list of configuration

Change-Id: I3289964e2ceaeb999803abc1f5d485857a80894b
2016-05-23 21:59:29 +00:00
Jean-Michel Trivi
740c0424f0 Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29
am: f2c8fb8620

* commit 'f2c8fb8620224eecfbc344a203e32e6563afcfd6':
  Recording activity notification: return list of configuration

Change-Id: I795d0a76efd044630cd275060dd6c11d595f0e82
2016-05-23 21:06:05 +00:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
2016-05-23 14:00:07 -07:00
Jean-Michel Trivi
bbcf18dbfd Merge "Recording activity notification: return list of configuration" into nyc-dev
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
2016-05-23 20:56:04 +00:00
Jean-Michel Trivi
f2c8fb8620 Merge "Recording activity notification: return list of configuration" into nyc-dev
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489
2016-05-23 20:55:58 +00:00
Jean-Michel Trivi
c991879f29 Merge "Recording activity notification: return list of configuration" into nyc-dev 2016-05-23 20:49:30 +00:00
Chris Wren
d44f936791 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: ec2e36a485
am: 99eed4b5d6

* commit '99eed4b5d6291fe8714ed55dbf4598db6fe29711':
  Don't throw RemoteException from new NLS APIs

Change-Id: If12e8f4b7194afbe4ec7f7d246d79ec1bb465cb2
2016-05-23 19:11:13 +00:00
Chris Wren
99eed4b5d6 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112
am: ec2e36a485

* commit 'ec2e36a4851780219e342c545467fb433ef16fd6':
  Don't throw RemoteException from new NLS APIs

Change-Id: If4175e64a71b2b02306f9eb579f9755492ea6dfd
2016-05-23 19:07:27 +00:00
Chris Wren
ec2e36a485 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
2016-05-23 19:01:27 +00:00
Chris Wren
4da0296e23 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: Ibafc3d9adeb046b2b43593285b6f605693b8682e
2016-05-23 19:01:21 +00:00
TreeHugger Robot
28d9ef8112 Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev 2016-05-23 18:54:20 +00:00
Tony Mak
c606893101 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5 am: 23642330a7
am: 6bd271c7d4

* commit '6bd271c7d441032d12299585be0681a2ac787020':
  Remove PROPERTY_WORK_CALL

Change-Id: Icbd3f7ec68fe4a88081b6c54abab85f6857ca4e6
2016-05-23 17:41:12 +00:00
Tony Mak
6bd271c7d4 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev am: 5ee420c0d5
am: 23642330a7

* commit '23642330a7e0732976a0c25ca7d54f59055a92d9':
  Remove PROPERTY_WORK_CALL

Change-Id: If68d597574abb14d0ee06503fe3cd2e351914d52
2016-05-23 17:32:23 +00:00