Makoto Onuki
5b11a81f9f
Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev
2016-05-27 22:48:33 +00:00
Paul Jensen
c545b8f005
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am: 83e50327fc am: ae8f345d15
...
am: 4aa3ffcded
2016-05-27 22:47:29 +00:00
Ivan Podogov
56cd15375e
Merge "Set the sensor batch size for accelerometer listener." into nyc-mr1-dev am: 22132cb6be
...
am: 758cfdc79b
2016-05-27 22:47:24 +00:00
Lorenzo Colitti
1e27ee69ea
Merge "Merge "Restore DHCP client logging." into nyc-dev am: 0f8529236e am: a0049256ed" into nyc-mr1-dev-plus-aosp
...
am: 9391317538
2016-05-27 22:47:21 +00:00
Lorenzo Colitti
e741b54158
Merge "Restore DHCP client logging." into nyc-dev am: 0f8529236e am: 4664b09778
...
am: 52c004d263
2016-05-27 22:47:16 +00:00
sreevanis
1b2098554d
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c am: fe33c063a9 am: 4b058ae5b7 am: 64b29d4f8c
...
am: 4afe8df3ee
2016-05-27 22:47:14 +00:00
Android Build Merger (Role)
ddb8133841
Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev
2016-05-27 22:46:28 +00:00
Joe Fernandez
3ccb88b97a
Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90
...
am: 25967b7577
2016-05-27 22:46:01 +00:00
TreeHugger Robot
49b515a2a5
Merge "Fix issue #28930592 : Scoring service binding is not reestablished." into nyc-dev
2016-05-27 22:44:19 +00:00
Winson
caa08333e1
Merge "Prevent setting the launch task id when docking." into nyc-dev am: 386a947616 am: fb8ff0fd31
...
am: 4499f5d5b7
2016-05-27 22:40:51 +00:00
Wale Ogunwale
2d6da36a4c
Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am: 20237bc68f am: f41776b211
...
am: 86fe32a1ee
2016-05-27 22:40:49 +00:00
Bart Sears
c8fb50ba1b
Revert "Remove ActivityManager calls with PM.mInstallLock held" am: c51e725644
...
am: 02f466e491
2016-05-27 22:40:45 +00:00
Sreevani Sreejith
f210e6f844
Merge "Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c am: fe33c063a9 am: 4b058ae5b7 am: 75fea11133" into nyc-mr1-dev-plus-aosp
...
am: a19a6cc0b4
2016-05-27 22:40:42 +00:00
Winson
9980d1eb3e
Merge "Merge "Prevent setting the launch task id when docking." into nyc-dev am: 386a947616 am: 2e494ecc21" into nyc-mr1-dev-plus-aosp
...
am: ed5f73b124
2016-05-27 22:40:38 +00:00
Hang Yin
a23ed40af7
Merge "Code Patch for camera preview switch tests" into nyc-dev
...
am: 5c950a8078
2016-05-27 22:40:26 +00:00
Wale Ogunwale
13c00802a5
Merge "Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am: 20237bc68f am: b3c7e1c4f2" into nyc-mr1-dev-plus-aosp
...
am: b1aa5535d8
2016-05-27 22:38:48 +00:00
Adam Lesinski
4bc5d99023
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: 7e762beb7f" into nyc-mr1-dev-plus-aosp
...
am: 31f191099f
2016-05-27 22:38:45 +00:00
Adrian Roos
b374f78327
Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e am: 63014c5f6c" into nyc-mr1-dev-plus-aosp
...
am: 8d7fb0df41
2016-05-27 22:38:43 +00:00
Roozbeh Pournader
2044c47a40
Merge "Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c am: 77efbbb3c5" into nyc-mr1-dev-plus-aosp
...
am: e0ad40b5e7
2016-05-27 22:38:40 +00:00
Wale Ogunwale
213d0e1414
Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: e3190c206c" into nyc-mr1-dev-plus-aosp
...
am: 5fd350997d
2016-05-27 22:38:37 +00:00
Adrian Roos
2608cc891d
Fix crash with intent-less actions
...
Follow-up to I00d46036a2cbb73f7f733fd35bf0b743a02807a1
Bug: 28818704
Change-Id: I9a444b9dd4cea92b4a770d7051c05c48818892ad
2016-05-27 15:36:30 -07:00
Joe Fernandez
25967b7577
Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs
...
am: 580bff3d90
2016-05-27 22:35:26 +00:00
Suprabh Shukla
4ec430e062
Adding Reset Demo Notification
...
RetailDemoMOdeService adds a notification which allows user to wipe
current session and start a fresh demo session.
Bug: 27280140
Change-Id: I59dd82d236287206a2ca747210b3423fdc62c185
2016-05-27 15:34:54 -07:00
Hang Yin
5c950a8078
Merge "Code Patch for camera preview switch tests" into nyc-dev
2016-05-27 22:34:47 +00:00
Philip P. Moltmann
d97fdfd943
Move Xerox recommendation plugin to service.
...
Only minimal changes just to make it work together with the other
plugins.
Bug: 28908572
Change-Id: Icac226b45e8a6885036466451d0e9f54a3b3c640
2016-05-27 15:32:19 -07:00
Joe Fernandez
580bff3d90
Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs
2016-05-27 22:31:02 +00:00
Winson
399d21e37c
Tweaking layout to make two-task stacks to closer match design.
...
- In the small-stack cases, set the initial state to top-align the
back-most task. In addition to offsetting the position, ensure that
the dim for the back-most task is offset by this new position.
- Fixing issue with wrong return value when update insets.
- Fixing issue where tasks disappear after rotating while scrolling the
stack, due to the scrollering setting the stack scroll to an invalid
scroll position in the new layout in the new orientation.
Bug: 27859654
Change-Id: Ia4aaa3fe445032493c94a8dee7f6fea33bee36ec
2016-05-27 15:30:06 -07:00
Joe Fernandez
faaa13e0cb
docs: update redirects for GMS and GCM reference docs
...
b/29003935
Change-Id: I5ad833276dbbfc21a3c5e55a4b2e37d6b3a40dda
2016-05-27 15:24:25 -07:00
Doris Liu
8fc70289b5
Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev
...
am: fceaa60e24
2016-05-27 22:22:14 +00:00
Rob Carr
0b92112775
Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf am: 197f9e1c7e" into nyc-mr1-dev-plus-aosp
...
am: aeb1d151c5
2016-05-27 22:20:51 +00:00
Garfield Tan
b479cec7bc
Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: 66f7553862" into nyc-mr1-dev-plus-aosp
...
am: 989d2e6b17
2016-05-27 22:20:44 +00:00
Robin Lee
2ba318fabd
Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: b4835e4f14" into nyc-mr1-dev-plus-aosp
...
am: 2ae3428fd5
2016-05-27 22:20:37 +00:00
Jorim Jaggi
2639dd95fe
Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 1833aafe7f" into nyc-mr1-dev-plus-aosp
...
am: fef5288111
2016-05-27 22:20:29 +00:00
Akshay Thakker
aac6ba85c2
Merge "Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 am: 66eeff63b7" into nyc-mr1-dev-plus-aosp
...
am: 4d95771836
2016-05-27 22:20:23 +00:00
Bert McMeen
c39175b889
Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 am: 260167cada" into nyc-mr1-dev-plus-aosp
...
am: 87f3aeeee2
2016-05-27 22:18:45 +00:00
sreevanis
5bec665110
Merge "Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc am: af7d6fa9a7" into nyc-mr1-dev-plus-aosp
...
am: 90fa062c1a
2016-05-27 22:18:41 +00:00
John Reck
41490550a6
Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 am: 769c456bc1" into nyc-mr1-dev-plus-aosp
...
am: 81956e5fc6
2016-05-27 22:18:36 +00:00
Kevin Hufnagle
8ae335ddfd
Merge "Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f am: 9e2c84014f" into nyc-mr1-dev-plus-aosp
...
am: 8e98306631
2016-05-27 22:18:31 +00:00
Selim Cinek
8bea1924d7
Merge "Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae am: 0361d504da" into nyc-mr1-dev-plus-aosp
...
am: 27432f0d60
2016-05-27 22:18:25 +00:00
Doris Liu
fceaa60e24
Merge "Copy native tree's property when mutate vector drawable" into nyc-dev
2016-05-27 22:17:00 +00:00
Robert Shih
ed78114ffd
Fix deadlock when showing subtitles MediaPlayer
...
Move all SubtitleTrack operations to TimeProvider's event handler thread.
Bug: 28784397
Change-Id: Iff848635390e99ffb19add03277a9d62feece4cc
2016-05-27 15:16:47 -07:00
Chris Tate
c64b4f9d4b
Merge "Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198 am: d9c9b591b7" into nyc-mr1-dev-plus-aosp
...
am: eced95f626
2016-05-27 22:16:21 +00:00
Jorim Jaggi
83c8e2a0cc
Merge "Fix toast with accessibility and app pinning am: cf984c56ad am: 8e68533c9d" into nyc-mr1-dev-plus-aosp
...
am: 364e2b07a5
2016-05-27 22:16:19 +00:00
George Mount
36b3ebf1f9
Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d am: b148f83ec0" into nyc-mr1-dev-plus-aosp
...
am: 522a19a330
2016-05-27 22:16:17 +00:00
Wyatt Riley
21baf755d4
Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 am: a868723467" into nyc-mr1-dev-plus-aosp
...
am: 149ba9af6e
2016-05-27 22:16:14 +00:00
Alan Viverette
e2e8e7f470
Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f am: ae2a646295" into nyc-mr1-dev-plus-aosp
...
am: 144a044308
2016-05-27 22:16:11 +00:00
Winson Chung
1ddc71ea8d
Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f am: c1434b4559" into nyc-mr1-dev-plus-aosp
...
am: 626e587b56
2016-05-27 22:14:00 +00:00
Adam Lesinski
ddacd0f779
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp
...
am: 0c67994e33
2016-05-27 22:13:57 +00:00
Adrian Roos
fb959b7bdf
Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e am: 59fd8dce39" into nyc-mr1-dev-plus-aosp
...
am: 7f65fca112
2016-05-27 22:13:55 +00:00
Roozbeh Pournader
9faf5602b3
Merge "Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c am: 51a8c19fb2" into nyc-mr1-dev-plus-aosp
...
am: daaa2eed9a
2016-05-27 22:13:52 +00:00
