Geoff Mendal
ec034cdb63
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25319151
Change-Id: I27d232328ebb25191d09ffc566cec2a55f79ff72
2015-10-29 12:22:19 -07:00
Dongwon Kang
1e2ae4066e
Merge "MediaBrowser: Handle onServiceConnected/Disconnected in the given thread"
2015-10-29 18:21:56 +00:00
Lorenzo Colitti
8a484fbb8c
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9 am: c52503acf0
...
am: bce5116b8d
* commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4':
Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 18:20:30 +00:00
Bryce Lee
52e52f6f56
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d am: 3b6f9f78cf
...
am: 698b33ea7f
* commit '698b33ea7f78d200df73ef869d68cfc5ab36e604':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 18:19:14 +00:00
Bryce Lee
bc8654748f
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81 am: 2adf45bee0
...
am: 8faa19c826
* commit '8faa19c8260d77c5ad7abc061bc06bc596be7c2b':
Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 18:17:41 +00:00
Bryce Lee
461ba0ce4a
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee am: 8b4f21b108
...
am: 2b47b6eed2
* commit '2b47b6eed247acc95a2d27980b2d20e43c852946':
Declare new interface for headset client bluetooth profile to query.
2015-10-29 18:15:23 +00:00
Philip P. Moltmann
9b172f08b2
Merge "Fix javadoc for CameraManager.AvailabilityCallback"
2015-10-29 17:50:51 +00:00
Steven Dao
84e7b4f588
Merge "Add missing actions to getActionSymbolicName - This improves the output of AccessibilityAction.toString() for debugging purposes."
2015-10-29 17:43:12 +00:00
Tom Hudson
0f174bb182
Merge "Merge six commits from master-skia to master"
2015-10-29 16:32:12 +00:00
Leon Scroggins III
f35b989d26
Merge six commits from master-skia to master
...
Also corrects some code under development behind the HWUI_NEW_OPS flags
to match the updated Skia API.
Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
previous-Change-Id: I85de3462ad1e4877784df38edc4bcd0acbd24e5e
Change-Id: Ide8e2f669e91a13c32521af3a16efdaa085c81d0
2015-10-29 12:29:03 -04:00
John Reck
0529672a8c
resolve merge conflicts of a1b8d77ca3 to master.
...
Change-Id: Ia78c6d31687542dfaba20b177e774333cfb1edb5
2015-10-29 09:05:53 -07:00
Alan Viverette
d8f56833c5
Merge "Show anchored context menu on long press"
2015-10-29 14:24:53 +00:00
Paul Mclean
438c220d78
Merge "Fixing problems with 1st connect of USB audio device to Fugu."
2015-10-29 13:40:47 +00:00
Paul McLean
c15f756443
Fixing problems with 1st connect of USB audio device to Fugu.
...
Also added some additional logging functions as we are not done
looking at connect/disconnect issues.
Leaving in tact the multi-device connect/disconnect logic (neeeds to
be revisited)
Bug: 24906368
Change-Id: Iff91c51a9c7013dde56182059f3747e1d6cd727b
2015-10-29 13:39:42 +00:00
Lorenzo Colitti
bce5116b8d
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9
...
am: c52503acf0
* commit 'c52503acf0a5e4140376391f57de539fbe60ea8f':
Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 08:16:31 +00:00
Lorenzo Colitti
c52503acf0
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d
...
am: e4aacaeec9
* commit 'e4aacaeec950691700d717efa894a7b51bc87fe2':
Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 08:09:27 +00:00
Lorenzo Colitti
e4aacaeec9
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
...
am: a2cc04736d
* commit 'a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
Don't crash if a DHCP server doesn't send the server ID option.
2015-10-29 08:02:31 +00:00
Lorenzo Colitti
a2cc04736d
Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev
2015-10-29 07:57:13 +00:00
Bryce Lee
698b33ea7f
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d
...
am: 3b6f9f78cf
* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 07:23:06 +00:00
Bryce Lee
3b6f9f78cf
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
...
am: 4636770f0d
* commit '4636770f0df6e91cd7fbdf01b958fbdda688db7a':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 07:16:07 +00:00
Bryce Lee
4636770f0d
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
2015-10-29 07:10:15 +00:00
Lorenzo Colitti
7611f1cdb4
Don't crash if a DHCP server doesn't send the server ID option.
...
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.
Bug: 25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
2015-10-29 16:09:16 +09:00
Bryce Lee
dc13382622
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
...
Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
2015-10-28 22:21:54 -07:00
Bryce Lee
8faa19c826
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81
...
am: 2adf45bee0
* commit '2adf45bee0b423fa6ca758b806a16b968c0a3c65':
Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 05:19:19 +00:00
Bryce Lee
2adf45bee0
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
...
am: 0a80294c81
* commit '0a80294c81d86a8bcdc6545b6e31929645cab306':
Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 05:10:41 +00:00
Bryce Lee
0a80294c81
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
2015-10-29 05:04:06 +00:00
Bryce Lee
70d4210e2e
Revert "Declare new interface for headset client bluetooth profile to query."
...
This reverts commit 694251eaaa8ea70a9b0427d55e9ede437c83a6d5.
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
2015-10-29 04:58:38 +00:00
Bryce Lee
2b47b6eed2
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee
...
am: 8b4f21b108
* commit '8b4f21b108828c08833767c1f3f908e1cd7f8477':
Declare new interface for headset client bluetooth profile to query.
2015-10-29 04:53:01 +00:00
Bryce Lee
8b4f21b108
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
...
am: a841973dee
* commit 'a841973deea9281bbb21035055918c0b0cb3230f':
Declare new interface for headset client bluetooth profile to query.
2015-10-29 04:45:09 +00:00
Bryce Lee
a841973dee
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
2015-10-29 04:39:08 +00:00
Bryce Lee
694251eaaa
Declare new interface for headset client bluetooth profile to query.
...
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug: 25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
2015-10-28 21:06:27 -07:00
Svetoslav Ganov
a1b8d77ca3
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b
...
am: 08d013d3a1
* commit '08d013d3a1e6306533c2fae1a4581986ffc9a642':
Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:33:09 +00:00
Svetoslav Ganov
08d013d3a1
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a
...
am: 35151fbc8b
* commit '35151fbc8b028f6633f477fd36044032a03b2bff':
Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:24:38 +00:00
Svetoslav Ganov
35151fbc8b
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
...
am: 2658cb002a
* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:16:46 +00:00
Svetoslav Ganov
2658cb002a
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
2015-10-29 01:10:46 +00:00
Dongwon Kang
082aed1ab4
MediaBrowser: Handle onServiceConnected/Disconnected in the given thread
...
The class assumes that the member variables are accessed in the same thread
when the class was created, but onServiceConnected/Disconnected is called
in the main thread according to the documentation.
Bug: 25307613
Change-Id: I86b63cc45fbc6995cedce39f5c151e99f76172d0
2015-10-29 00:35:01 +00:00
Jun Mukai
38a023fad7
Change pointer icon shape for multi window divider.
...
This depends on If1cd34cc5253c9f8a50decba90498001093a9db7.
Bug: 23193951
Change-Id: I40443356f9151f8a8024f6a62517dd74e68fce41
2015-10-28 17:25:06 -07:00
Jun Mukai
794469916c
Merge "Add setPointerShape() to View for customizable pointer icon shape."
2015-10-29 00:16:33 +00:00
Daichi Hirono
3147977a57
Merge "Update JavaDoc in MtpDatabase."
2015-10-29 00:04:58 +00:00
Chong Zhang
bef461f612
Several fixes for saved surface
...
- Do not save if the exiting app is no longer top of task
- Mark saved surfaces as invalid when recoving memory, they will
be reclaimed if they're hidden.
- Save surface when visibility changed to GONE
- Discard saved surface after rotation
- Misc minor fixes and clean-up
bug: 19940527
Change-Id: I5760c7a7b4bf37ef6bdd39cae793a97cf7579429
2015-10-28 16:59:28 -07:00
Filip Gruszczynski
7b0181cea9
Merge "Fix bounds of secondary stack when docked one is visible."
2015-10-28 23:43:45 +00:00
Filip Gruszczynski
6b614433f6
Merge "Freeform to recents app transition."
2015-10-28 23:34:57 +00:00
Filip Gruszczynski
ba47f81446
Fix bounds of secondary stack when docked one is visible.
...
Bug: 25346448
Change-Id: I35f4bc0ae518904b760a38449c2687392dda91f4
2015-10-28 16:13:49 -07:00
Mikhail Naganov
b851929c32
Add new version of WebViewClient.shouldOverrideUrlLoading callback
...
The new version provides more information about the origin of
the load, which helps making more secure decision on how to proceed
with it.
Bug: 22346196
Change-Id: I27f591bf5e846bde14335a2c929758a2b48d0763
2015-10-28 16:05:41 -07:00
Filip Gruszczynski
7d428c8606
Merge "Fix touching outside of popup not dismissing it."
2015-10-28 23:01:16 +00:00
Winson Chung
7f1a576f59
Merge "Moving static RecentsConfiguration instance to Recents."
2015-10-28 23:00:04 +00:00
Winson
53ec42cb17
Moving static RecentsConfiguration instance to Recents.
...
- Matches the other static instances
Change-Id: I25bf474ceb0b8d6cc52c22e83273ffb2fb64cc9d
2015-10-28 15:58:10 -07:00
Winson Chung
5dd803c938
Merge "Fixing touch handling on resized tasks."
2015-10-28 22:34:37 +00:00
Dianne Hackborn
4c9564567b
Merge "Add some debugging for device idle alarms."
2015-10-28 22:07:33 +00:00
Filip Gruszczynski
f8a2a63202
Fix touching outside of popup not dismissing it.
...
We only included the exact popup window area for intercepting touches
that would dismiss the popup. We need to intercept the parent area, so
we use the task or stack associated with the window to determine which
touch events to intercept and use as dismiss. This doesn't affect which
touch events will be delivered to the window.
Bug: 25329650
Change-Id: Ie248ec67bb5328fd67b470f556cf206ce888514c
2015-10-28 15:03:29 -07:00
