Dake Gu
0d8b33282c
am 5a5ae1f2: fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
...
* commit '5a5ae1f202fa87ae4f32e1fc9021988efb18be7b':
fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
2014-07-25 23:16:50 +00:00
Ji-Hwan Lee
9e8ade2eb7
TIF: Rename ComponentName variables to "component" consistently
...
Currently, it's sometimes "name", or "service".
Change-Id: I91dffe30fd2b873c744dbde2c027f0582f55746f
2014-07-25 23:16:48 +00:00
Dake Gu
f03c139018
fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
...
b/16575308
Change-Id: Ieb4f15a8ead7da9682c97d4d342cd77e0b85e5f8
2014-07-25 23:10:51 +00:00
Michael Wright
0fee1dc886
am 5f3eb6ca: am 5239ebe3: Add missing documentation for createVirtualDisplay
...
* commit '5f3eb6ca4ede2983501504e5acfec76725bb46bc':
Add missing documentation for createVirtualDisplay
2014-07-25 23:08:54 +00:00
Ruben Brunk
83bb97d4a4
am ddb65f32: am b4b65247: camera2: Update preview counter after request completed.
...
* commit 'ddb65f32e519df750ca81dccf0661333eeef525e':
camera2: Update preview counter after request completed.
2014-07-25 23:08:50 +00:00
Winson Chung
d500ba674a
am 1f3cac65: am bee771f7: Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
...
* commit '1f3cac657ed909419b2f43767e5009d038cee454':
Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
2014-07-25 23:08:45 +00:00
Evan Charlton
5e83bc357c
am eeb7ea86: am 2f22a0eb: Merge "Make creating the Connection synchronous" into lmp-dev
...
* commit 'eeb7ea861dfab6099566c394ed2f91e30e1c4f47':
Make creating the Connection synchronous
2014-07-25 23:08:41 +00:00
Sreeram Ramachandran
e0d6374773
am f87f2fc6: am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev
...
* commit 'f87f2fc6bd56363f0b8ccb16c4eb959250b63594':
Implement support for bypassable VPNs.
2014-07-25 23:08:31 +00:00
Fabrice Di Meglio
0b9fe09268
am d009491e: am 09370607: Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
...
* commit 'd009491e8811b712de0e620c53f0417dcffa575c':
Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
2014-07-25 23:08:27 +00:00
Michael Wright
bc537dbc17
am 5239ebe3: Add missing documentation for createVirtualDisplay
...
* commit '5239ebe357401da5380489db1eeb7720ddb32091':
Add missing documentation for createVirtualDisplay
2014-07-25 23:05:25 +00:00
Ruben Brunk
8c80c834f6
am b4b65247: camera2: Update preview counter after request completed.
...
* commit 'b4b652474daf1f845ef313c9ff7c5216f1f90ba1':
camera2: Update preview counter after request completed.
2014-07-25 23:05:21 +00:00
Winson Chung
717d0bdcf0
am bee771f7: Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
...
* commit 'bee771f7316b19c79e03c6a06287d9d03c3d2af6':
Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
2014-07-25 23:05:17 +00:00
Evan Charlton
7f855cba4a
am 2f22a0eb: Merge "Make creating the Connection synchronous" into lmp-dev
...
* commit '2f22a0eb06fe677eceb05c6bc650b94bdb1e00ef':
Make creating the Connection synchronous
2014-07-25 23:05:13 +00:00
Sreeram Ramachandran
7dd3a4a6fa
am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev
...
* commit 'a6754382ce829fdeb3542678a314a2e19fd5621b':
Implement support for bypassable VPNs.
2014-07-25 23:05:10 +00:00
Fabrice Di Meglio
16b7e2e804
am 09370607: Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
...
* commit '0937060722512fcc0b46852afaeffaa755b2f5ce':
Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
2014-07-25 23:05:06 +00:00
Michael Wright
5438e4e173
Add missing documentation for createVirtualDisplay
...
Fix incorrect access modifier in Activity documentation.
Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362
camera2: Update preview counter after request completed.
...
Bug: 15116722
- This was causing the preview counter to double decrement
for requests where the jpeg callback was executed first.
Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
2014-07-25 22:53:32 +00:00
Winson Chung
c37e129539
Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
2014-07-25 22:47:33 +00:00
Fabrice Di Meglio
75b121553f
Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
...
- simply create a method for passing those parameters
- remove non needed constants
Change-Id: If6e7d21ff07370edd8c73d1e9b5c5f820f3deb5d
2014-07-25 22:36:22 +00:00
John Reck
97da26c447
am 6e9883ba: am 5253d8df: Merge "Shut up" into lmp-dev
...
* commit '6e9883ba38d089d6868ee6d7b70fb2d21a79e6f8':
Shut up
2014-07-25 22:32:04 +00:00
John Reck
2c70ade77d
am 5253d8df: Merge "Shut up" into lmp-dev
...
* commit '5253d8df85b5d70128403ffc7aa154d0e3c9fe74':
Shut up
2014-07-25 22:27:58 +00:00
Dake Gu
549496ebed
am 575e0a7f: am 3c54a06e: ExitTransitionCoordinator: suppressLayout during running transition
...
* commit '575e0a7f7c5719f04dcfb354dd86b169838c3236':
ExitTransitionCoordinator: suppressLayout during running transition
2014-07-25 22:27:58 +00:00
Dake Gu
05ddac583f
am 3c54a06e: ExitTransitionCoordinator: suppressLayout during running transition
...
* commit '3c54a06eec94d68aa62adb14c4905c0d15c12287':
ExitTransitionCoordinator: suppressLayout during running transition
2014-07-25 22:23:59 +00:00
John Spurlock
db5df7afa3
am cbdadc7d: am d5410ff7: Merge "Volume: Persist unsafe volume playback time." into lmp-dev
...
* commit 'cbdadc7de9bedbec7ee2692adc23caf3ca9a2214':
Volume: Persist unsafe volume playback time.
2014-07-25 22:21:42 +00:00
Dake Gu
f7ff2205d9
ExitTransitionCoordinator: suppressLayout during running transition
...
b/16570734
Change-Id: I52d7132b91256085aa9e535575e978a6031fb276
2014-07-25 22:18:57 +00:00
John Spurlock
38042f87fd
am d5410ff7: Merge "Volume: Persist unsafe volume playback time." into lmp-dev
...
* commit 'd5410ff73b613fc490ec143c3ebe0088548bb152':
Volume: Persist unsafe volume playback time.
2014-07-25 22:17:49 +00:00
Jay Civelli
4632163c84
am 84891303: am c82a1157: Add new intent to prompt user for their device credential. DO NOT MERGE
...
* commit '848913032f5f641a0ed141d92aeefef435030169':
Add new intent to prompt user for their device credential. DO NOT MERGE
2014-07-25 22:12:00 +00:00
Winson Chung
2a909e07de
am 206c4deb: am 6615b209: Announcing when a task is dismissed (for accessibility). (Bug 9181212)
...
* commit '206c4deb69d209a71ea2f2af5a2eb69039a864c8':
Announcing when a task is dismissed (for accessibility). (Bug 9181212)
2014-07-25 22:07:49 +00:00
Jay Civelli
c22116abad
am c82a1157: Add new intent to prompt user for their device credential. DO NOT MERGE
...
* commit 'c82a11573810ed4d1f40568d19afc27f726829af':
Add new intent to prompt user for their device credential. DO NOT MERGE
2014-07-25 22:06:54 +00:00
Jay Civelli
3087e49667
Add new intent to prompt user for their device credential. DO NOT MERGE
...
Bug: 16242766
cherry-pick from master 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26
Change-Id: I76efb3bef888eb1e94c4e5455934816fb4acc5bc
2014-07-25 22:04:19 +00:00
Winson Chung
81531c72e0
am 6615b209: Announcing when a task is dismissed (for accessibility). (Bug 9181212)
...
* commit '6615b20987d56b63a97da44864704d56cfe7be0d':
Announcing when a task is dismissed (for accessibility). (Bug 9181212)
2014-07-25 22:02:56 +00:00
Winson Chung
2b92253021
Announcing when a task is dismissed (for accessibility). (Bug 9181212)
2014-07-25 21:58:26 +00:00
Yorke Lee
09002ed867
am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
...
* commit 'e120d1e5b58f4d1b2d39e687e69a96adc4cd251d':
Update the value of PinnedPositions.UNPINNED to 0
2014-07-25 21:53:48 +00:00
Yorke Lee
6edd156cd9
am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
...
* commit 'c8f3ac841b3bb761f8d53db555f3c252370a906f':
Update the value of PinnedPositions.UNPINNED to 0
2014-07-25 21:49:07 +00:00
Jeff Sharkey
1409834664
am bf9964cb: am e52581f6: Offer force-dex-opt when running as root.
...
* commit 'bf9964cb8784e2ac6ea5a2274b4ef9288b4d2da9':
Offer force-dex-opt when running as root.
2014-07-25 21:21:40 +00:00
Jeff Sharkey
14d4df06e0
am e52581f6: Offer force-dex-opt when running as root.
...
* commit 'e52581f66ae5ba1a7e60ae7900603ba8a90f9d2c':
Offer force-dex-opt when running as root.
2014-07-25 21:18:16 +00:00
RoboErik
e0b8c378b7
Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-dev
...
* changes:
Add context to MediaController constructor
Add getPackageName to MediaController
Expose a way to set a PendingIntent for restarting playback
Finish plumbing for launch intents in sessions
2014-07-25 21:16:23 +00:00
RoboErik
031149cd5f
Add context to MediaController constructor
...
This also adds a convenience method to MediaSession to allow getting
a controller instead of having to create and cache your own.
bug:16561220
Change-Id: I87f551a7474e71f1cf2f07e0e541c3a4515cd977
2014-07-28 11:02:15 -07:00
RoboErik
aa4e23bbb3
Add getPackageName to MediaController
...
This removes the MediaSessionInfo class and adds a method on the
controller to get the package name. This also converts code that
depended on the session's UUID to use the token for comparison or
the Tag in the case of test code that needs a string identifier.
Change-Id: Icb8dc76c70e23e897da8fd07651c524b96372bf9
2014-07-25 16:22:59 -07:00
RoboErik
b214efbb91
Expose a way to set a PendingIntent for restarting playback
...
This is to allow apps to set a PendingIntent to restart playback. This
is not persisted across reboots but will allow music to start playing
again for the life of the system. Only the most recent priority app with
a PI set will be cached. This also deprecates methods in AudioManager
that do this and unhides the unregister method in MediaSessionManager.
Change-Id: I66fbf5856333468d8cb8a3022809778ba00d426e
2014-07-25 16:22:18 -07:00
RoboErik
e34c09daf8
Finish plumbing for launch intents in sessions
...
This finishes out the plumbing for setting a launchable PendingIntent
on a session and getting it from a controller to launch an app's UI.
Change-Id: I0c9506e7c3f0ebf57070ca7e0d91324eb3fdd1e1
2014-07-25 16:22:17 -07:00
RoboErik
76fca4e177
Add getFlags and getSessionToken to MediaController
...
getFlags was hidden, should have been public. Also added getSessionToken
as a convenience method for apps to get the token used to create a
controller.
bug:15408392
Change-Id: Icb19b43ebb7e01727eec1a4e667dafcfc3b8d4eb
2014-07-25 16:22:16 -07:00
Jean-Michel Trivi
03caa16577
Merge "AudioTrack transfer mode in JNI" into lmp-dev
2014-07-25 21:16:23 +00:00
Jean-Michel Trivi
c8d6b6fc7d
AudioTrack transfer mode in JNI
...
Set the correct transfer mode in AudioTrack JNI and configuring
the native AudioTrack instance, based on the memory mode
passed in Java.
Add comment about the audio attributes parameter superseeding
the stream type parameter in the AudioTrack constructor.
Change-Id: Ia43f42874452ac47c3c044d5446a4732da0fd56c
2014-07-28 17:14:10 +00:00
John Reck
1c7a170fa3
Merge "Avoid calling non-final methods in ctor" into lmp-dev
2014-07-25 21:16:23 +00:00
John Reck
aae9f3bf17
Avoid calling non-final methods in ctor
...
Bug: 16239227
Avoid potential issues in views that override invalidate() but
are not prepared to have overridden methods called prior to their
ctor
Change-Id: Ic2574bdfea454451d6881c7e27a6474dc4dbc07c
2014-07-28 09:30:36 -07:00
John Reck
4830cede0c
Merge "Throw IAE on invalid scale" into lmp-dev
2014-07-25 21:16:23 +00:00
John Reck
30794944d1
Throw IAE on invalid scale
...
Bug: 16565964
Change-Id: I0cc35c532b42433381e1ae7f350c95ecbb4d09c3
2014-07-28 09:20:21 -07:00
Jeff Sharkey
56e079efc6
Merge "First pass at Materializing DocumentsUI!" into lmp-dev
2014-07-25 21:16:23 +00:00
Jeff Sharkey
6963148e22
First pass at Materializing DocumentsUI!
...
Initial Material asset drop, which still needs some tweaking. Moved
back to framework list item selectors, giving us ripples. Using
accent color overlay for activated items. Align all items to new
Material grid, including insetting list divider and resizing list
items on wide screens.
Fix obscure RTL drawing bug.
Still lots of work left.
Bug: 15836082
Change-Id: I729cc7dcb0271ee62b55d1e036fc28427fc0dd3d
2014-07-28 05:41:43 +00:00