Commit Graph

52942 Commits

Author SHA1 Message Date
John Reck
3ebdc0c3b5 Merge "Super-fast getLineWidth for BL" 2015-10-09 14:16:04 +00:00
Mahaver Chopra
76b08a9d17 Documentation of EXTRA_PROVISIONING_WIFI_SECURITY_TYPE
Valid values for EXTRA_PROVISIONING_WIFI_SECURITY_TYPE in the documentation

Bug: 23379302
Change-Id: I039432d81de6834c01bbe6ca0fc668afec38d040
2015-10-09 12:32:31 +01:00
Lorenzo Colitti
cccaa51f34 Merge "Connect the DHCP UDP socket to the server." 2015-10-09 04:36:02 +00:00
Lorenzo Colitti
577255e1d4 Connect the DHCP UDP socket to the server.
This makes it so that the socket cannot receive datagrams from
anybody except the DHCP server. This does not improve security,
because we never read from the UDP socket anyway, but it does
make ListeningPortsTest pass.

Bug: 23906864
Bug: 23933386
Change-Id: I82fe9d6c6c520536ffd6422bcc60fab664999e6f
2015-10-09 13:27:22 +09:00
Lorenzo Colitti
69eedb4de0 Merge "Add a null check to hasIPv4AddressOnInterface." 2015-10-09 04:04:27 +00:00
Lorenzo Colitti
89b6392046 Add a null check to hasIPv4AddressOnInterface.
Change-Id: Ie38505ec0a93f4060348d92db341c536b7d60ed0
2015-10-09 12:36:30 +09:00
Wale Ogunwale
6efc461966 Merge "Added rules for status/nav bar customization when in multi-window mode" 2015-10-08 23:04:23 +00:00
Julia Reynolds
8b14288c94 Merge "Remove rename automatic zen rule." 2015-10-08 22:27:10 +00:00
Hui Shu
fb78ae50b5 Merge "Format the Javadoc using <p>" 2015-10-08 22:23:03 +00:00
Chet Haase
416ee42556 Merge "Fix ValueAnimator.getCurrentPlayTime()" 2015-10-08 21:07:30 +00:00
Alan Viverette
1aba36d721 Merge "Revert "Reduce CascadingMenuPopup's reliance on internal ListView state"" 2015-10-08 19:54:49 +00:00
Alan Viverette
2ac975deb3 Revert "Reduce CascadingMenuPopup's reliance on internal ListView state"
Introduced some regressions. Reverting until we can do better testing.

This reverts commit 8375d63998.

Change-Id: I9b15d63e52c814ef8985b86f8a50359e39355d39
2015-10-08 19:54:16 +00:00
Chet Haase
4365e5a137 Fix ValueAnimator.getCurrentPlayTime()
Return a valid value for the current play time if the animator has
been seeked to a play time or fraction, but not yet started.

Issue #24717972 animator.getCurrentPlayTime() is all messed up

Change-Id: I15f1329b65410b4b0366a23a3419b5987305a865
2015-10-08 12:47:10 -07:00
Filip Gruszczynski
7813ecb1d1 Merge "Don't remove task from recents if closed by caption button." 2015-10-08 19:36:50 +00:00
Filip Gruszczynski
c29ecc86c2 Don't remove task from recents if closed by caption button.
When the user clicks X in non client decor of a freeform task, we
don't want it to be removed from recents. The task gets finished,
but it will remain in recents.

Bug: 24718309

Change-Id: I8f47e310903ee7f839ec92f5c8ff3a9f1e09118c
2015-10-08 12:22:22 -07:00
Hui Shu
af899edcf6 Merge "Allow WebView to startActivity and receive results" 2015-10-08 18:29:40 +00:00
Wale Ogunwale
6e94a9eb87 Added rules for status/nav bar customization when in multi-window mode
Status & nav bars are always visible and opaque when freeform or docked
stack is visible

We still need to refactor the code to allow force opaque to be updated
independently for the status bar and nav. bar. Once that is done, the
status bar should be transcluent if freeform stack is visible and
docked stack isn't and the status bar should be opaque if freeform
& docked stack are both visible.

Bug: 24365214
Change-Id: I48ecc6067c9b0f7239c12c98eb46f3fcefacd4f9
2015-10-08 11:15:20 -07:00
Hui Shu
86ea9c1479 Format the Javadoc using <p>
Change-Id: I3c1ecf2f381e227cd413d6f3760a105ec521f807
2015-10-08 10:23:08 -07:00
Hui Shu
f119c5208f Allow WebView to startActivity and receive results
This CL makes webview override View#onActivityResult and gives webview
itnernals the access to View#startActivityForResult.

BUG: 24416313
Change-Id: Ia49db1348a1f5ee0c648a8b16551d9becc7caddd
2015-10-08 10:20:15 -07:00
Makoto Onuki
daa6521505 Merge "setDeviceOwner() now requires a full component name." 2015-10-08 17:01:07 +00:00
Julia Reynolds
4fe98d6d4c Remove rename automatic zen rule.
Use zen rule id as key when finding matching rule to update.

Bug: 22977552
Change-Id: I7beeb5688aabe409a9a72aaa3aa27932d590c489
2015-10-07 20:10:58 -04:00
Yin-Chia Yeh
074bf3cbda am cbb3dc67: am 527da81f: am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
* commit 'cbb3dc67cff56db3efd2032a49b0cc7186a60534':
  Camera: fix wrong FULL feature string
2015-10-07 22:01:05 +00:00
Yin-Chia Yeh
cbb3dc67cf am 527da81f: am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
* commit '527da81f13fa65b924859ae87f6ccce8d3614140':
  Camera: fix wrong FULL feature string
2015-10-07 21:54:41 +00:00
Yin-Chia Yeh
a71bb6b986 am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
* commit '9d68833686e04ff5ff910a9d90fe99bc1347aaca':
  Camera: fix wrong FULL feature string
2015-10-07 21:41:38 +00:00
Yin-Chia Yeh
9d68833686 am a636be6c: Camera: fix wrong FULL feature string
* commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e':
  Camera: fix wrong FULL feature string
2015-10-07 21:36:35 +00:00
Robert Carr
a8fe43f09c Ensure SurfaceView requests WM relayout when size changes.
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).

Bug:23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
2015-10-07 11:24:31 -07:00
Alan Viverette
fde4b0028f am b46886f4: am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
* commit 'b46886f41d142cc63e054814caf76d15bf2f8cb6':
  IndexOutOfBoundsException on addPreference in PreferenceGroup
2015-10-07 17:01:53 +00:00
Alan Viverette
8c190029db am 2235ecd5: am f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed"
* commit '2235ecd5ec06e48bbcecb6f22a653e470d94dfef':
  Reset the setOnKeyListener callback when view is destroyed
2015-10-07 17:01:43 +00:00
Alan Viverette
b46886f41d am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
* commit 'f518ad0a4941236b72b5d090320d4ab70ebbf26b':
  IndexOutOfBoundsException on addPreference in PreferenceGroup
2015-10-07 16:54:26 +00:00
Alan Viverette
2235ecd5ec am f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed"
* commit 'f8ac5c3469e53a7934731cfb854efb2975251ab4':
  Reset the setOnKeyListener callback when view is destroyed
2015-10-07 16:54:17 +00:00
Alan Viverette
4e91907bf8 am 8a0c8e78: am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
* commit '8a0c8e78a7d938288e065b21e78b2de6097b1599':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
2015-10-07 16:43:11 +00:00
Alan Viverette
3a3fea4fed am 4524278b: am 7de6ae15: Merge "To call TypedArray.recycle() when we are done with the array."
* commit '4524278bcb948196e8a9bfff69a566fce1fdc794':
  To call TypedArray.recycle() when we are done with the array.
2015-10-07 16:43:00 +00:00
Alan Viverette
f518ad0a49 Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" 2015-10-07 16:38:02 +00:00
Alan Viverette
f8ac5c3469 Merge "Reset the setOnKeyListener callback when view is destroyed" 2015-10-07 16:36:58 +00:00
Alan Viverette
8a0c8e78a7 am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
* commit '6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
2015-10-07 16:34:35 +00:00
Alan Viverette
4524278bcb am 7de6ae15: Merge "To call TypedArray.recycle() when we are done with the array."
* commit '7de6ae159e0652cabe57ea8814ce8633049644a2':
  To call TypedArray.recycle() when we are done with the array.
2015-10-07 16:34:26 +00:00
Alan Viverette
6a06f12c3f Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 2015-10-07 16:23:36 +00:00
Alan Viverette
7de6ae159e Merge "To call TypedArray.recycle() when we are done with the array." 2015-10-07 16:22:36 +00:00
Filip Gruszczynski
81cdf2b216 Merge "Dismissing of docked stack by dragging to the side." 2015-10-07 00:47:35 +00:00
Filip Gruszczynski
57b6ccecc0 Dismissing of docked stack by dragging to the side.
Bug: 24623909
Change-Id: Ic93b169442de1eb4dca9f65a87ae2b813bcef043
2015-10-06 17:46:05 -07:00
Stefan Kuhne
f8f7eeb3e1 Merge "Resolving incorrect rendering of content while resize" 2015-10-06 22:47:33 +00:00
Skuhne
980ee47ffe Resolving incorrect rendering of content while resize
The staged content bounds need to be set by the content renderer
and not by the resize thread.

Bug: 24671393
Change-Id: I8f84ec01a4ac6c1e783cc6208ca77ca6c01ba838
2015-10-06 13:52:17 -07:00
Yin-Chia Yeh
a636be6c9a Camera: fix wrong FULL feature string
Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
2015-10-06 13:45:20 -07:00
Julia Reynolds
5686addb76 Merge "Add id and creation date to Zen rules." 2015-10-06 19:48:44 +00:00
Chong Zhang
a42521ca0a Merge "Make window callbacks non static member of ViewRootImpl" 2015-10-06 18:56:13 +00:00
Alan Viverette
266cdd4839 Merge "Reduce CascadingMenuPopup's reliance on internal ListView state" 2015-10-06 18:43:24 +00:00
Chong Zhang
dcee1dea6b Make window callbacks non static member of ViewRootImpl
Move add/removeWindowCallbacks to onAttachedToWindow/onDetachedFromWindow.

There might be more than one windows in an app process, the window
callbacks need to be per window, not global.

bug: 24679461
Change-Id: I216ff27b2a41ecfe7399a8161df362bebc0ac96a
2015-10-06 10:29:55 -07:00
Wale Ogunwale
6a5913681e Make activities trageting SDK N or greater resizeable by defualt
Also, removed condition that prevented activity from setting
device orientation if it is resizeable. We only need to prevent
it from affecting the orientation when it isn't fullscreen and
not all the time. Work is being tracked in bug 24685213.

Bug: 19865400
Change-Id: I9e1ea77c6acd13801a06f791e0b8859fbcb0f15c
2015-10-06 09:12:02 -07:00
Wale Ogunwale
012904e43a Merge "Added SDK version code for N." 2015-10-06 14:40:41 +00:00
Alan Viverette
8375d63998 Reduce CascadingMenuPopup's reliance on internal ListView state
Bundles cascading menu information and stores it in a stack representing
the hierarchy of added menus.

Bug: 23970448
Change-Id: Icc0a96ea2dd4320fd4dae9626435ed82a6165480
2015-10-06 10:40:25 -04:00