Victor Chang
a6aee6bf73
Merge "Add Directory.ENTERPRISE_FILE_URI"
2016-01-15 00:45:47 +00:00
Andre Eisenbach
2787b33708
Fix OOB pairing related API build breakage
...
Change-Id: I813eaec0c5e97939998f4a1b26875af222ab4f89
2016-01-15 00:35:00 +00:00
John Reck
c816180962
Merge "Fix leak in unclipped save layer"
2016-01-15 00:30:08 +00:00
John Reck
8e068d5fd3
Fix leak in unclipped save layer
...
Change-Id: I31f146af2cb6f5cb8dd19bb0feff0ae35b864eba
2016-01-14 16:28:28 -08:00
Winson Chung
a6b591e053
Merge "Resetting the native shader instance when the shader changes."
2016-01-15 00:25:19 +00:00
Deepanshu Gupta
9757c933b0
LayoutLib: Fix device used comments in intensive tests am: 1665a621da
...
am: bbd0b324ba
* commit 'bbd0b324ba8e89bd51aad0a59b1a1c891383779f':
LayoutLib: Fix device used comments in intensive tests
2016-01-15 00:23:33 +00:00
Alan Viverette
bc490ca283
Don\'t verify the scrollbar drawable am: a53c3b2197 am: ca6b87fea6
...
am: c8ef3f8730
* commit 'c8ef3f8730d20541e8f01f500c380fa09aa3853c':
Don't verify the scrollbar drawable
2016-01-15 00:21:22 +00:00
Deepanshu Gupta
14df39f9e5
Merge "Fix custom font rendering" into mnc-ub-dev
...
am: f5984d5fce
* commit 'f5984d5fce511a669e8d4bb6eaeb9679ff2ba9f0':
Fix custom font rendering
2016-01-15 00:19:08 +00:00
Deepanshu Gupta
bbd0b324ba
LayoutLib: Fix device used comments in intensive tests
...
am: 1665a621da
* commit '1665a621da2d503d405fb784bd50b5a8596539a1':
LayoutLib: Fix device used comments in intensive tests
2016-01-15 00:17:19 +00:00
Amit Mahajan
aa17797fda
Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev
...
am: 49442a1dd7
* commit '49442a1dd7bbf15e6014e88d8143f198a43bad05':
Adding new intent for EMERGENCY_CALL_STATE_CHANGE
2016-01-15 00:16:28 +00:00
Jakub Pawlowski
2fc6e6bfd2
Implementation of BluetoothDevice.createBondOutOfBand
...
This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.
Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1
2016-01-15 00:01:02 +00:00
Philip P. Moltmann
cdf2b40034
Enforce non-nullness in PrinterId and exploit it.
...
Change-Id: Ifdf3b2329548a665d609dd66b738baab5c765b54
2016-01-14 15:59:44 -08:00
Amit Mahajan
49442a1dd7
Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev
2016-01-14 23:54:14 +00:00
Deepanshu Gupta
4da12f19a6
Merge "Minor fix to wrong error message"
2016-01-14 23:54:14 +00:00
Tor Norbye
8b4a6981fd
Minor fix to wrong error message
...
Change-Id: I3d34c90d37d35d0649a6ef8a73ca0d9320f975dd
2016-01-14 15:53:05 -08:00
Makoto Onuki
6dc6b89962
Merge "Remove the index columns from the blocked provider."
2016-01-14 23:48:36 +00:00
Deepanshu Gupta
f5984d5fce
Merge "Fix custom font rendering" into mnc-ub-dev
2016-01-14 23:48:17 +00:00
Deepanshu Gupta
2ea852541f
Fix custom font rendering
...
The context was using the wrong asset manager.
Bug: http://b.android.com/198897
Change-Id: Id58473a4539ed93a9f338c730686128c7089fc92
2016-01-14 23:46:42 +00:00
Winson
dfb8cb4580
Resetting the native shader instance when the shader changes.
...
Change-Id: Ib4f8f02d2b777049072e33eabf07d00945c08779
2016-01-14 15:43:38 -08:00
Winson
6ea2588a5d
Fixing issue with action button not showing/animating.
...
- The system flags need to be reread when the task stack is reset.
- Since we check for alpha before doing the animation, we need to
initialize the action button alpha back to zero when we reset the
task view.
Change-Id: I97530a7bdd5e934ab1d5831ef30cf7774418ed95
2016-01-14 15:31:54 -08:00
Winson
f3918002f3
Fixing issue with checking the docked stack state for the wrong user.
...
Bug: 26256285
Change-Id: I068ee8250dc75bda984092300d75031422fbbd11
2016-01-14 15:31:47 -08:00
Winson
d8d896cefa
Adding logging for history and paging.
...
Change-Id: Ibd9ff72858897c0a3680e81b94172e667e1291cc
2016-01-14 15:31:43 -08:00
Winson
df3012bc8d
Enforce single deletion per key press.
...
Bug: 26467824
Change-Id: I88542cfbd52a4a60bc8319390f2688fac5f2c754
2016-01-14 15:31:39 -08:00
Winson
4b057c6787
Fixing crash when dismissing last stack task.
...
- The crash was due to us trying to get an anchor task when there were
no more tasks in the stack. The original call to check the stack
task count was poorly named so updating the name of that call as well.
Bug: 26500050
Change-Id: I9652e90a6a2e19008c5c84ce877afca576b3175f
2016-01-14 15:31:35 -08:00
Winson
671e8f91aa
Removing custom swipe helper.
...
Change-Id: Ic28ab343f86ab6f80d8c0409a3218513bd8880af
2016-01-14 15:31:16 -08:00
Winson
5500390a00
Reducing numerous extraneous allocations.
...
Change-Id: Icca49f12a9e0be08eb6d4dbbbf2fd5994a3a25a5
2016-01-14 15:23:38 -08:00
Winson
407d8d08f0
Ensure that the front-most task never dims when scrolling the stack.
...
Change-Id: I370311b78203c079c4bbfa67753da13f91a15cbc
2016-01-14 15:23:34 -08:00
Winson
3e87474145
Improving drag and drop animations.
...
- Expanding drop targets to indicate the size of the to-be docked window
- Fixing animation when dropping task
- Fixing drag view z order
- Fixes issue where the dock divider position in WM is not exact
- Requiring user to move the slop distance before accepting drops
Change-Id: I2f6eab504db7126c19e0c680629e89a39e7512e3
2016-01-14 15:23:20 -08:00
Deepanshu Gupta
1665a621da
LayoutLib: Fix device used comments in intensive tests
...
Change-Id: I65ee2f8bdf096ea991e72c99777c8981da7b5ae2
2016-01-14 23:19:29 +00:00
Adam Lesinski
5d125f2b7c
Merge "AAPT2: Accept zip, jack, jar, and flata extensions as archives"
2016-01-14 23:19:18 +00:00
Adam Lesinski
656a577a34
AAPT2: Accept zip, jack, jar, and flata extensions as archives
...
Change-Id: I3a4db129998e2351e8221f9d72a4b40d2c7a8cf9
2016-01-14 15:17:41 -08:00
Adam Lesinski
e05d8fb91b
Fix FeatureSplit tests to work properly with Java code
...
Change-Id: I2f6d770c860c05e0d5a407fd76dc59dd748e3c3f
2016-01-14 15:14:59 -08:00
John Reck
9b1002295f
Merge "Fix "leak" in FrameBuilder.textureLayer test"
2016-01-14 23:14:49 +00:00
Alex Klyubin
224af9e3f8
Merge "Verify APKs using APK Signature Scheme v2."
2016-01-14 23:14:46 +00:00
Winson Chung
c7abf52091
Merge "Indicator for task auto-select"
2016-01-14 23:13:59 +00:00
John Reck
a55b5d6c65
Fix "leak" in FrameBuilder.textureLayer test
...
DeferredLayerUpdater always did a post to delete itself, which
would result in the test thinking it had leaked an object since
it wasn't deleted when it returned. Fix this by deleting immediately
if we're already on the right thread.
Remove RenderState's requireGlContext assert as it's now
covered by GpuMemoryTracker, which is also more test friendly.
RenderState's assert required an actual EGL context, which we
don't mock away in unit tests.
Change-Id: Ic23eb54e7151355f7acca483d7464350c9d6a87f
2016-01-14 15:09:10 -08:00
John Reck
1d0f17b4f5
Merge "Fix leak in OffscreenBufferPoolTests"
2016-01-14 22:59:24 +00:00
Philip P. Moltmann
cde1c2a717
Merge "Clean up API for PrinterInfo."
2016-01-14 22:51:39 +00:00
John Reck
00159554e0
Fix leak in OffscreenBufferPoolTests
...
Change-Id: Ic16df75bdc01d902639df98bc6798d9383510342
2016-01-14 14:47:07 -08:00
Tor Norbye
ab3bdf0984
Merge "Fix @IntDef annotation javadoc"
2016-01-14 22:38:28 +00:00
Peter Schiller
b124d5607f
Indicator for task auto-select
...
Change-Id: I081222b84a5f90e77890724977821ed481fe3924
2016-01-14 14:37:11 -08:00
Jeff Sharkey
158a168935
Merge "Installing packages always needs to create dirs."
2016-01-14 22:30:24 +00:00
Jeff Sharkey
b4c298e399
Installing packages always needs to create dirs.
...
When we're installing an existing app for a user, we still need to
create the private data storage for that app.
Bug: 26554043
Change-Id: Ie18e0952600f860325718f84094aedeac3681403
2016-01-14 15:29:01 -07:00
Neil Fuller
79ebcde07b
Merge "Hide static setDefault methods in ICU4J"
...
am: 9e892f53dd
* commit '9e892f53dd489c824b6a39c45028f838123daa85':
Hide static setDefault methods in ICU4J
2016-01-14 22:28:43 +00:00
Ian Pedowitz
7191a77585
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev am: 33001945a8
...
am: 33b55366c5
* commit '33b55366c5138237e3da268a05f08b064426becc':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
2016-01-14 22:26:32 +00:00
Ian Pedowitz
33b55366c5
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
...
am: 33001945a8
* commit '33001945a82ba8cd5b5ad27b808312aa2ef210af':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
2016-01-14 22:21:37 +00:00
Neil Fuller
9e892f53dd
Merge "Hide static setDefault methods in ICU4J"
2016-01-14 22:20:16 +00:00
Ian Pedowitz
33001945a8
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
2016-01-14 22:18:32 +00:00
Sanket Agarwal
1bec6a5b0d
Add support for AVRCP 1.3.
...
* Add metadata support.
* Add player settings support.
* Add playback support.
A2DP Settings App support.
Bluetooth: A2DP Sink support for Settings App
- add support for A2DP Sink in Settings App. This will enable connection
initiation and updation on Settings App
- add framework Apis to support A2DP Sink. Any third party Apps can access
A2DP Sink priority of device and playing state of device
- add support for key to set priority. This manages priority of device for
A2DP Sink profile
Change-Id: If5f9139f37cdb9d200387877c7801075205c78a0
2016-01-14 21:59:33 +00:00
John Reck
cbc5bd57f0
Merge "Track texture memory globally"
2016-01-14 21:49:42 +00:00