Michal Karpinski
dc8ac6fbb5
Merge "API polish in DPM for organization color and name methods" into nyc-dev am: 1271cef
...
am: 96d49b1
2016-04-13 13:40:03 +00:00
Michal Karpinski
1271cef419
Merge "API polish in DPM for organization color and name methods" into nyc-dev
2016-04-13 13:28:08 +00:00
Dongwon Kang
5e3c6801f4
Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev am: 4c3dcc0
...
am: 4655cdd
2016-04-13 02:01:14 +00:00
Eino-Ville Talvala
552781c9c0
Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev am: 777c4e7
...
am: d848ebb
2016-04-13 02:00:38 +00:00
Dongwon Kang
4c3dcc0a16
Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev
2016-04-13 00:36:35 +00:00
Eino-Ville Talvala
777c4e7644
Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev
2016-04-13 00:08:09 +00:00
Dongwon Kang
e9db0e1ed1
TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
...
Bug: 28078300
Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60
2016-04-12 16:44:40 -07:00
Makoto Onuki
a9a8d44cdc
Merge "ShortcutManager: Address API review feedback." into nyc-dev am: 1d616f0
...
am: 9d25ead
2016-04-12 23:07:29 +00:00
Sunny Goyal
0a6fc940d7
Merge "Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev am: 1fe7dfa" into nyc-dev-plus-aosp
...
am: 411d2f9
2016-04-12 22:41:37 +00:00
Felipe Leme
877d517b4f
Merge "Merge "Make getStorageVolume(File file) public." into nyc-dev am: 93c442e" into nyc-dev-plus-aosp
...
am: d5ce189
2016-04-12 22:41:12 +00:00
Makoto Onuki
1d616f0d88
Merge "ShortcutManager: Address API review feedback." into nyc-dev
2016-04-12 22:34:17 +00:00
Eino-Ville Talvala
fa5e2a156d
Camera/Surface: Update OutputConfiguration API
...
- Rename "surface set ID" to "surface group ID"
- Remove setSurfaceSetId
- Use constructor overloads to set surface group ID, make
OutputConfiguration immutable
- Add Surface.getConsumerDescriptor to make it possible to verify
if two Surfaces have the same backing consumer
- Cache initial surface generation ID in OutputConfiguration so that
changes in a Surface's internals will label it is as a
new output
- Add sample use case for surface group IDs
Bug: 27950763
Bug: 28076469
Change-Id: I13251d1dd3d26a978ffbedc519966524e93bc61c
2016-04-12 14:51:17 -07:00
Sunny Goyal
1fe7dfa66a
Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev
2016-04-12 20:55:32 +00:00
Felipe Leme
93c442e44f
Merge "Make getStorageVolume(File file) public." into nyc-dev
2016-04-12 20:44:06 +00:00
Makoto Onuki
b6d3523dfb
ShortcutManager: Address API review feedback.
...
- "delete" -> "remove"
- add/deleteDynamicShortcut() now takes a list.
- Throttling default settings is now 2 calls / hour.
- Add categories to ShortcutInfo.
- getIconResourceId() is now public
Bug 27923857
Bug 27548047
Change-Id: I8457b30e4b2f7c63ab2988648b37178fd16ea45b
2016-04-12 10:35:20 -07:00
Alexander Hills
d98785e288
Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1
...
am: 0666069
2016-04-12 17:29:39 +00:00
Alexander Hills
e3f3cb1048
Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev
2016-04-12 17:10:19 +00:00
Yi Kong
0755fc6c61
Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
...
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad05a77eee41
2016-04-12 17:12:26 +01:00
Alex Hills
4ec3ff4f8f
Fixes name of intent launch flag for Action Extender
...
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty
Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
2016-04-12 11:44:36 -04:00
Yi Kong
05a77eee41
Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
...
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad
2016-04-12 15:45:10 +01:00
Michal Karpinski
74cd73079c
API polish in DPM for organization color and name methods
...
- Returning and accepting CharSequence instead of String
- Enforcing 100% opacity and adjusting javadocs for color
format
- Adding @ColorInt annotations
Bug: 27531295
Change-Id: Id27d4fd5e7bb4d746cc61288457eb4eb86224505
2016-04-12 15:17:52 +01:00
Shubham Ajmera
aeeabf072f
Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev am: 68b19f2
...
am: 0983951
2016-04-12 12:38:31 +00:00
Kirill Grouchnikov
e1684cda2b
Merge "Add @TestApi method to Spinner to test whether popup is showing."
2016-04-12 12:29:08 +00:00
Shubham Ajmera
a871ab1687
Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
...
Bug: 27426743
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
2016-04-12 10:10:25 +01:00
Felipe Leme
c250e45eda
Make getStorageVolume(File file) public.
...
BUG: 27951594
Change-Id: I354f6a29b3fa3374ea07bcbe14096e9673d282c5
2016-04-11 18:52:28 -07:00
Makoto Onuki
1187239423
Merge "ShortcutManager: First cut of CTS" into nyc-dev am: bc20320
...
am: 0beb56d
2016-04-11 23:30:43 +00:00
Makoto Onuki
bc20320f7f
Merge "ShortcutManager: First cut of CTS" into nyc-dev
2016-04-11 23:11:41 +00:00
Sunny Goyal
45d3e97748
Changing LauncherApps to resolve activity by component name
...
This makes the behavior of resolveActivity similar to isActivityEnabled.
Not that starting this activity may still fail due to other reasons.
Bug: 27549770
Change-Id: I924d7aa2305c64fd319ca1e38058f9f956c0c256
2016-04-11 16:02:27 -07:00
Makoto Onuki
5ba0d3e3a3
ShortcutManager: First cut of CTS
...
Bug 27548047
Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
2016-04-11 14:48:44 -07:00
Jeff Sharkey
dd1a2a3bb8
Merge "Clean up AudioRouting API internals." into nyc-dev am: 0e2e780
...
am: 98646e8
2016-04-11 20:51:22 +00:00
Hangyu Kuang
402a01ea74
Merge "media: update VP9 CodecProfileLevel" into nyc-dev am: 333c7d3
...
am: a20e438
2016-04-11 20:40:37 +00:00
Jeff Sharkey
0e2e7806b7
Merge "Clean up AudioRouting API internals." into nyc-dev
2016-04-11 20:33:50 +00:00
Hangyu Kuang
f0ef572fd0
media: update VP9 CodecProfileLevel
...
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
2016-04-11 12:08:03 -07:00
Jeff Sharkey
ed2edc7a8e
Clean up AudioRouting API internals.
...
Reuse existing OnRoutingChangedListener APIs and internal logic by
extending the new AudioRouting.OnRoutingChangedListener. We use
new default methods to delegate incoming calls on the legacy
interfaces.
Fix a handful of locking bugs.
Bug: 27950070, 27952052, 27949198
Change-Id: Ie584108bcbeeab064d8e27d4984e541f31d36728
2016-04-11 13:01:55 -06:00
Greg Kaiser
4f633c7d32
Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev am: f4d3805
...
am: 1fd8534
2016-04-11 17:35:52 +00:00
Greg Kaiser
f4d380537a
Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev
2016-04-11 17:23:48 +00:00
Makoto Onuki
b29ec1a7e4
Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev am: 390a813
...
am: 9a98e46
2016-04-11 17:01:07 +00:00
Makoto Onuki
390a81302f
Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev
2016-04-11 16:45:10 +00:00
Greg Kaiser
cb83bd04b7
ContextHubManager: Avoid bad NanoApp objects
...
We provide a preferred constructor for the user which will
always generate a serializable NanoApp object. While we
still support the other path, we throw a specific exception
when trying to serialize a bad NanoApp object to ease
debugging.
Change-Id: I7ee610f0fce2f0dd489526e4819f66035281024b
2016-04-11 08:27:10 -07:00
Clara Bayarri
c4e4274d9e
Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev am: 738ab04
...
am: 3f19243
2016-04-11 09:52:19 +00:00
Clara Bayarri
738ab04fd9
Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev
2016-04-11 09:43:16 +00:00
Zhijun He
8fcc25dade
Merge "Camera2: update API per API council review" into nyc-dev am: b0fe2a9
...
am: c2ec322
2016-04-09 05:57:41 +00:00
Bryce Lee
744743a869
Merge "Add granular control over disabled effects." into nyc-dev am: 196a057
...
am: 931690f
2016-04-09 05:56:02 +00:00
Julia Reynolds
c54a7d7b76
Merge "Allow the ranker to autobundle notifications." into nyc-dev am: 3898db9
...
am: af343d6
2016-04-09 05:53:09 +00:00
Jason Monk
847c7e8c2a
Merge "Allow mode of TileService to be changed" into nyc-dev am: aa336f8
...
am: 1476f35
2016-04-09 05:52:16 +00:00
Adam Powell
c72c505b23
Merge "Chooser filtering and caller direct share targets" into nyc-dev am: fe5e1a7
...
am: a1be176
* commit 'a1be176a42db8dad7dcebca8842b95bbf6cc6bf9':
Chooser filtering and caller direct share targets
Change-Id: I17d733ef5f6d2381dea3050f666436fbfe185982
2016-04-09 05:50:11 +00:00
Zhijun He
b0fe2a9637
Merge "Camera2: update API per API council review" into nyc-dev
2016-04-08 23:30:41 +00:00
Zhijun He
0034743236
Camera2: update API per API council review
...
Per API concil recommendation, made below API change:
* change method name from createCaptureSessionByOutputConfiguration to
createCaptureSessionByOutputConfigurations
* Change method name from
createReprocessableCaptureSessionWithConfigurations to
createReprocessableCaptureSessionByConfigurations
Bug: 27950067
Change-Id: I8346d384210556a40bc2544c3660cc4819f304a1
2016-04-08 23:21:06 +00:00
Kirill Grouchnikov
fd62b35758
Add @TestApi method to Spinner to test whether popup is showing.
...
Change-Id: I36e7f7c8ca6a69bdced3dd830e3ae0dde4181a4e
2016-04-08 17:56:47 -04:00
Bryce Lee
196a05724d
Merge "Add granular control over disabled effects." into nyc-dev
2016-04-08 20:59:10 +00:00
