236483 Commits

Author SHA1 Message Date
Chris Craik
d7285c29d1 Merge "Add refBitmap tests" into nyc-dev 2016-03-24 19:44:15 +00:00
Winson Chung
533daacef7 Merge "Disabling affiliated tasks." into nyc-dev 2016-03-24 19:10:48 +00:00
Rob Carr
157fea650b Merge "Do not adjust child windows placement for fit to display." into nyc-dev 2016-03-24 19:08:41 +00:00
Robert Carr
3d93897a56 Do not adjust child windows placement for fit to display.
Consider the case where we have made a child windows parent
and task smaller in the docked stack but the client has not
yet caught up and requested a new size for the child window.
In this case it is possible for the child windows requested
layout to extend beyond the bounds of the available display area
(in this case the containing frame). Our intended behavior is
to clip this extra area, while preserving the relative offset
of the child and parent window. If we apply gravity to fit within
the display frame, the behavior will instead be to modify
this offset in order to reduce the amount of cropped window.
While this is a sensible idea for laying out fullscreen tasks, it
is not helpful for windows layed out in the parent frame.

Bug: 27687126
Bug: 27676101
Bug: 27601572
Change-Id: I80607a29506dc5a127ac0eab12c2aeb9450e13f6
2016-03-24 19:07:56 +00:00
Deepanshu Gupta
90b6454cb3 Merge "Support getResource*Name() methods for Resources" into nyc-dev 2016-03-24 19:04:21 +00:00
Deepanshu Gupta
618ca261f3 Support getResource*Name() methods for Resources
The following methods are now supported:
getResourceEntryName
getResourcePackageName
getResourceTypeName
getResourceName

Bug: http://b.android.com/181872
Change-Id: If06b5e0687ab6f8cb20ab77f339870dd08a84ce1
2016-03-24 12:02:17 -07:00
Alan Viverette
4a2f9857c2 Merge "Ensure correct width and height are used during popup positioning" into nyc-dev 2016-03-24 18:33:57 +00:00
Robin Lee
363e70dd00 Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev 2016-03-24 18:32:52 +00:00
Joe LaPenna
23c63dd65f Merge "Allow setting doze timeouts based on system feature" into nyc-dev 2016-03-24 18:18:26 +00:00
Chris Craik
734f146c1e Add refBitmap tests
Change-Id: I769457ff8934689bf425bab34a65d2a743959f9d
2016-03-24 11:10:10 -07:00
Alan Viverette
f50df4362a Ensure correct width and height are used during popup positioning
Passes the width and height into findDropDownPosition() rather than
relying on global state. Ensures that an update is forced if any
aspects of the LayoutParams are changed during drop down position
computetion. Cleans up method and argument naming.

Bug: 27819843
Change-Id: Id85e2a0e81e0ea6a754dadf7c1d1c2493a5979b0
2016-03-24 14:08:24 -04:00
Yohei Yukawa
cdf90bb674 Merge changes I16312592,Iadfc226e into nyc-dev
* changes:
  Revert "Remove redundant IMM#mServedInputConnection."
  Revert "Make sure to call back reportFinish() on the desired Handler."
2016-03-24 17:54:21 +00:00
Samuel Tan
a70cbf7f9c Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev 2016-03-24 17:46:22 +00:00
Abhijith Shastry
d1ceef09a7 Merge "Add an unblock API to BlockedNumberContract." into nyc-dev 2016-03-24 17:33:58 +00:00
Jeremy Joslin
52f0ea56db Merge "Add meteredHint to WifiConfiguration." into nyc-dev 2016-03-24 17:27:54 +00:00
Yohei Yukawa
223db8b6f5 Revert "Remove redundant IMM#mServedInputConnection."
This reverts commit afb6558c8f5e0ee797b252558d7e529e3d946d8f.

It turns out that this CL caused a serious regression Bug 27824691.

Bug: 25332806
Bug: 27824691
Change-Id: I16312592743a6673449c492ee5ba533256d343ea
2016-03-24 10:26:19 -07:00
Robin Lee
a249aee10b Declare provider.Settings intent for VPN fragment
Currently used for a number of tests. May also be useful for 3rd-party
apps using VPN in some manner or another.

Bug: 27700919
Bug: 26887434
Change-Id: I4d269954265a2590499e20150f009fe437c8078f
2016-03-24 17:25:06 +00:00
Yohei Yukawa
1fa5f594a2 Revert "Make sure to call back reportFinish() on the desired Handler."
This reverts commit 16e2c7b59aacf44df7aaa0d04e0228240907487f.

It turns out that I1181e067aa5bedbdf0c7ec1bcec479257aea511c caused
a serious regression Bug 27824691.  To revert that CL, we have to revert
this one first.

Bug: 25332806
Bug: 27824691
Change-Id: Iadfc226eb91cc969b77c9d98e04ec3c76fe86ead
2016-03-24 10:24:23 -07:00
Chong Zhang
4bbbeaa68b Merge "Do not adjust bounds for IME until IME is actually displayed" into nyc-dev 2016-03-24 17:17:57 +00:00
Chris Tate
d93a6fa96d Merge "Kill the real/isolated uid group, not the ApplicationInfo uid" into nyc-dev 2016-03-24 17:11:04 +00:00
Winson
d8f7431d0f Disabling affiliated tasks.
Bug: 27701456
Change-Id: I9ed42215bdff12540f68e803ea822d38890a1382
2016-03-24 09:59:51 -07:00
Winson Chung
5d443a43a5 Merge "Fix transition to the wrong location on screen." into nyc-dev 2016-03-24 16:55:20 +00:00
Selim Cinek
45acc156be Merge "Fixed a bug with the collapsed media template" into nyc-dev 2016-03-24 16:46:46 +00:00
Selim Cinek
3bd54dc6e1 Fixed a bug with the collapsed media template
the buttons could become cut off in case it didn't
have a text.

Change-Id: Ic54a9ffeb02ecff675d60ef0a70593087672e022
Fixes: 27493948
2016-03-24 09:43:51 -07:00
Paul Jensen
a6f2691391 Merge "Make captive portal login app not restart upon device rotation." into nyc-dev 2016-03-24 16:03:12 +00:00
Wale Ogunwale
9c91696217 Merge "Return to correct home stack task in multi-window mode" into nyc-dev 2016-03-24 15:26:47 +00:00
Derek Sollenberger
4ee3b6216d Merge "Enforce API preconditions in Java instead of deferring to Skia." into nyc-dev 2016-03-24 15:05:14 +00:00
George Mount
f189c2ffa2 Merge "Invalidate entire scene root when executing the transition." into nyc-dev 2016-03-24 14:45:22 +00:00
Clara Bayarri
3e5bf786b7 Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev 2016-03-24 13:30:48 +00:00
Lenka Trochtova
e014b9ef68 Merge "Let the profile owner set lock-to-apps if the user is affiliated." into nyc-dev 2016-03-24 12:39:44 +00:00
Clara Bayarri
0c4ad623ce Merge "Keyboard Shortcuts: Make Modifiers human-readable" into nyc-dev 2016-03-24 11:50:38 +00:00
Clara Bayarri
bfd996f5cd Merge "Keyboard Shortcuts: Add Keycodes for shortcut representation" into nyc-dev 2016-03-24 11:49:05 +00:00
Clara Bayarri
fcd7e80b21 Keyboard Shortcuts: plumb deviceId through
Bug: 27673736
Change-Id: Ie72807aa8c2bfd142b081a6a915e101c16d31473
2016-03-24 11:47:32 +00:00
Clara Bayarri
b9057df9f5 Keyboard Shortcuts: Make Modifiers human-readable
Bug: 27454791 27419260
Change-Id: Ic98b9e265f16d417b9c401032714b49deb8d9f92
2016-03-24 11:47:31 +00:00
Clara Bayarri
4e850ffaa7 Keyboard Shortcuts: Add Keycodes for shortcut representation
This changes the current API given app feedback received. In order to use
keycodes as well as chars we also must implement a mapping of Keycodes to
Display labels as only keys with a single char representation are provided
by KeyCharacterMap.

Bug: 27409783
Change-Id: I3da653adc4b8cbc66a4d1aa24a5f9181f71e83c3
2016-03-24 11:47:23 +00:00
Lenka Trochtova
a7c85adeda Let the profile owner set lock-to-apps if the user is affiliated.
BUG: 25632687

Change-Id: I76008b6a8e2194155154dc7693d43ce20f7e9fad
2016-03-24 11:15:23 +01:00
Tomasz Mikolajewski
50c8d49d4c Merge "Make the activated root color darker in DocumentsUI for better a11y." into nyc-dev 2016-03-24 09:37:58 +00:00
Janis Danisevskis
b52a874f3c Merge "Document restricted app private file permissions" into nyc-dev 2016-03-24 09:33:45 +00:00
Tomasz Mikolajewski
588d6934d5 Make the activated root color darker in DocumentsUI for better a11y.
Bug: 27724950
Change-Id: Ie1150aae6e6dabe1dc460a99deec4ccfa48ec080
2016-03-24 17:02:46 +09:00
Rob Carr
5c791ab40b Merge "Transform app animator crop to child window space." into nyc-dev 2016-03-24 05:46:25 +00:00
Rob Carr
525748804e Merge "Include animation layer adjustment even while docked." into nyc-dev 2016-03-24 05:46:00 +00:00
Sergei Vasilinetc
ab852f2972 Merge "Add offset() to Path's fast-case mode" into nyc-dev 2016-03-24 05:02:02 +00:00
Erik Kline
3e4c79e474 Merge "Add "track default" type to NetworkRequestInfo" into nyc-dev 2016-03-24 04:20:22 +00:00
Erik Kline
371c7b7dc6 Add "track default" type to NetworkRequestInfo
The "default network tracking" request is somewhere between a listen
and a request, in previous semantics. It is more like a listen in that
it doesn't cause any network to be brought up, but also like a request
in that will only get callbacks about a single network at a time (not
all networks that might match).

This change minimally splits the NetworkRequest types into 3: LISTEN,
REQUEST, and TRACK_DEFAULT.

Change-Id: I2d113b2f6eed526a7808592bce0118260a56f77c
2016-03-24 12:52:54 +09:00
Seigo Nonaka
6ef4a1c9cc Merge "Add cursor positioning tests for emoji." into nyc-dev 2016-03-24 03:45:57 +00:00
Winson Chung
0df18a12bf Merge "Adding workaround for crash." into nyc-dev 2016-03-24 03:25:29 +00:00
Winson
c5b12dd37e Fix transition to the wrong location on screen.
- TaskStackLayoutAlgorithm currently depends on the launch state to 
  calculate the right bounds, which means that the launch state has to
  be set before the call to getThumbnailTransitionActivityOptions().  
  When double-tapping quickly, we would use the old launch state which
  would cause us to calculate the wrong bounds.

Change-Id: I5dd9f38b49652a6ac8bed4b9fd4ffa02dfe90289
2016-03-23 20:25:12 -07:00
Adrian Roos
93c687c4ba Merge "Scroll to remote input view" into nyc-dev 2016-03-24 02:52:32 +00:00
Daichi Hirono
b2ef9ed7c4 Merge "Use mipmap instead of drawable for app icon of DocumentsUI." into nyc-dev 2016-03-24 02:50:18 +00:00
Tyler Gunn
0e3aff1ab5 Merge "IMS: Changes for MultiEndpoint" into nyc-dev 2016-03-24 02:39:08 +00:00