Commit Graph

53053 Commits

Author SHA1 Message Date
Roozbeh Pournader
ca9dbf596d am ebdf60e7: am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit 'ebdf60e7c800b2ccda01887a304ddc0edce0361d':
  Fix line height problem with inline images in StaticLayout.
2015-10-16 22:20:01 +00:00
Roozbeh Pournader
ebdf60e7c8 am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.
2015-10-16 22:12:46 +00:00
Roozbeh Pournader
b3538082d7 am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '5362f273e91885041b7cb246667cff3ceca74703':
  Fix line height problem with inline images in StaticLayout.
2015-10-16 22:01:49 +00:00
Roozbeh Pournader
5362f273e9 Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 2015-10-16 21:54:12 +00:00
Julia Reynolds
52815c3bb4 Merge "resolved conflicts for 429e7dcd to master" 2015-10-16 20:37:46 +00:00
George Mount
97339f196f Merge "Fix documentation for setTransition to include fade." 2015-10-16 20:34:22 +00:00
Julia Reynolds
c72c931eb8 resolved conflicts for 429e7dcd to master
Change-Id: Id0aca75915a054253d032d333defba1a38b80abe
2015-10-16 16:25:40 -04:00
Julia Reynolds
429e7dcd09 am 542052dd: am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '542052dd83e89f7cebc07aa0004a8592efc12364':
  Add 'until next alarm' option to QS zen panel.
2015-10-16 19:55:25 +00:00
Julia Reynolds
96faf5c8fa am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit 'a762c210d2901bedce5b7972eb139c4d5e59dcd1':
  Add 'until next alarm' option to QS zen panel.
2015-10-16 19:41:54 +00:00
Julia Reynolds
a762c210d2 Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev 2015-10-16 19:38:22 +00:00
George Mount
27b3ae6126 Fix documentation for setTransition to include fade.
Bug 25016696

Also add annotations for FragmentTransaction methods.

Change-Id: If3d1427d83dd7c399609bf8fd9a54467224d3a35
2015-10-16 12:36:58 -07:00
Erik Kline
2b49a7df64 Merge "Incorrect time used in some NTP server responses" 2015-10-16 19:02:00 +00:00
Jerry Wong
32d52f344a Incorrect time used in some NTP server responses
Per RFC 4330, a NTP server response should be discarded when:
    - the stratum is 0 (unspecified), or
    - the leap indicator is 3 (unsync'ed), or
    - the mode is not 4 (server) / 5 (broadcast), or
    - the transmitted time is 0.

Update SntpClient so that such responses would be discarded.

Additionally:
    - make some variables suitably "final"
    - enable logging
    - add alternate requestTime() for testing
    - add some miniscule test coverage

Cherry-picked from Jerry Wong's

    https://partner-android-review.googlesource.com/#/c/460074

Bug: 24719581
Change-Id: Id11a79a6e53ce95500ed4b4d691a29c260666f6c
2015-10-17 03:36:32 +09:00
Chris Craik
78327393ac Merge "Rename DisplayListData to DisplayList" 2015-10-16 18:36:01 +00:00
Chris Craik
003cc3dec8 Rename DisplayListData to DisplayList
Change-Id: I25f6bb88ffdf9baf7e8e4e2a294aa8c9d2a4605b
2015-10-16 10:38:34 -07:00
Jun Mukai
547c346bb3 Merge "Allow changing mouse cursor for the edges of resizable window." 2015-10-16 17:13:25 +00:00
Jun Mukai
41aab00c3e Allow changing mouse cursor for the edges of resizable window.
Bug: 23193951
Change-Id: I38662a61ff829e5b441e1c8b9f472eb0d75904e4
2015-10-16 10:11:32 -07:00
Jeff Sharkey
e1ed980d4c am de0b34ea: am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit 'de0b34ea14cfd5a5d219ee6e3d15ca4b04b6ce2e':
  Update docs to reflect adoptable behavior.
2015-10-16 16:45:35 +00:00
Wale Ogunwale
8e0d7f6173 Merge "Use StringBuilder to construct window title string." 2015-10-16 16:38:42 +00:00
Jeff Sharkey
de0b34ea14 am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit 'd56756fdee9fce3d08bea769710d7173bcbc263a':
  Update docs to reflect adoptable behavior.
2015-10-16 16:38:29 +00:00
Xiaohui Chen
f04f3005b0 Merge "Add UserHandle.isSystem() api" 2015-10-16 16:29:44 +00:00
Jeff Sharkey
535726f637 am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
  Update docs to reflect adoptable behavior.
2015-10-16 16:25:38 +00:00
Wale Ogunwale
29ffdc91b8 am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev
* commit 'be6555105a9325d0b7073c08a0bd4dc0b5ce1fb3':
  Disassociate system windows from apps
2015-10-16 16:18:45 +00:00
Jeff Sharkey
0c15693e8d Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 2015-10-16 16:18:38 +00:00
Wale Ogunwale
be6555105a Merge "Disassociate system windows from apps" into mnc-dr-dev 2015-10-16 16:14:45 +00:00
Wale Ogunwale
9b34442568 Use StringBuilder to construct window title string.
Change-Id: I9193b7f5180f165d517cbfe0345f84e161b851d2
2015-10-16 09:07:45 -07:00
tiger_huang
20ebb4c2d4 Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.

This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).

This change is related to the following changes:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

Bug: 24967303
Bug: https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
2015-10-16 08:21:45 -07:00
Wale Ogunwale
d4f2b641d3 am be02134c: am fceaedda: am 75693994: Merge "Disassociate system windows from apps"
* commit 'be02134cbc7ef98e73f118aba45a92908d818553':
  Disassociate system windows from apps
2015-10-16 14:08:14 +00:00
Wale Ogunwale
be02134cbc am fceaedda: am 75693994: Merge "Disassociate system windows from apps"
* commit 'fceaedda41f9133a4d4213720b15950ef43dd00c':
  Disassociate system windows from apps
2015-10-16 14:00:47 +00:00
Wale Ogunwale
fceaedda41 am 75693994: Merge "Disassociate system windows from apps"
* commit '75693994f60bdec9a10db98ddb8addd2bc3f8bbb':
  Disassociate system windows from apps
2015-10-16 13:54:54 +00:00
Roozbeh Pournader
431e506b53 Fix line height problem with inline images in StaticLayout.
Previously, paragraphs with ImageSpans in their middle would continue to
carry the height of the image into the line height of next lines. This was
a regression from L.

The bug was due to StaticLayout's out() method almost always
modifying the value of its parameter "fm", although that was only
intended when there were LineHeightSpans in the text. The method
generate() was assuming that it can restore fmTop etc to metrics of
the current span by setting them from "fm" after out() was run, while
"fm" was modified by out() and its original values was lost!

The fix makes sure to set chooseHt back to null if there were no
LineHeightSpans, so out() would not modify "fm" unless necessary.

AOSP bug: https://code.google.com/p/android/issues/detail?id=188042
Bug: 24548073

Change-Id: I0d00af384c35a9d863377972318da9db7668118f
2015-10-16 02:49:13 -07:00
tiger_huang
ff58e30aca Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.

This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).

This change is related to the following changes:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

Bug:
https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
2015-10-16 12:30:38 +08:00
Filip Gruszczynski
d2f1d94fe5 API for minimal width/height of an activity.
Bug: 21409825

Change-Id: Id6286064713672366dd4dc1f80258450a8039c36
2015-10-15 17:02:59 -07:00
Rob Carr
cbc4e08fb5 Merge "Revert "Sync SurfaceView position changes to parent render."" 2015-10-15 22:54:11 +00:00
Rob Carr
7e1d861a9a Revert "Sync SurfaceView position changes to parent render."
This reverts commit 6104dc9560.

Change-Id: If9d709bc65e7a817bd2c1b5768c7c33a9317638f
2015-10-15 22:53:30 +00:00
Rob Carr
70b7073fea Merge "Sync SurfaceView position changes to parent render." 2015-10-15 22:53:15 +00:00
Robert Carr
6104dc9560 Sync SurfaceView position changes to parent render.
In order to provide pixel perfect movement of SurfaceViews
'within' other views (e.g. scrolling) we need to be able to
synchronize the attached (parent window) painting with the
movement of the SurfaceView (recall, SurfaceViews are positioned
behind their attached windows and the parent must render a
transparent region for the SurfaceView to appear). Provide
a new WindowManager method to reposition an attaching window
(that is to say, a window which has an attached window like
SurfaceView) and defer the transaction until the parent frame.
SurfaceView is hooked up to use this for movement. This is still
'racy' in the hardware accelerated case as the render thread
could be on either side of dequeing the frame we are working on.

Change-Id: Ic33915043380ab8cd9eb4920e224b35234ed867d
2015-10-15 22:35:48 +00:00
Xiaohui Chen
fd5b77444e Add UM.isSameProfileGroup()
This optimizes the performance to check if two users are in the same
profile group.

Change-Id: I493a3475b848487836f4dbe01529c63165ace483
2015-10-15 22:02:07 +00:00
Julia Reynolds
8e2d2bbeec Add 'until next alarm' option to QS zen panel.
Unlike the implementation in LMR1, this is a countdown condition
(a countdown until the time of what was the next alarm when the
rule was created). The rule will not change if alarms change.
Also, alarms up to 7 days in the future will be considered.

Bug: 21648799
Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb
(cherry picked from commit 0842fe87b2)
2015-10-15 17:02:00 -04:00
Xiaohui Chen
1fa7680c9c Add UserHandle.isSystem() api
This is added in order to deprecate the isOwner() api.

Bug: 24869636
Change-Id: I80a7a5559525faf261b9d9c7a8593e6ff5db4b22
2015-10-15 12:09:32 -07:00
Chris Craik
d25c9018fb Merge "Throw IndexOutOfBoundsException for invalid start/count values" 2015-10-15 16:02:53 +00:00
Jun Mukai
e4111566ca Merge "Allow changing mouse pointer icon for the current context." 2015-10-15 14:46:46 +00:00
Julia Reynolds
bd18c9fd0a am 3afdd417: am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit '3afdd4177244423037a6c54650dd34ed2721aad8':
  Update volume slider on device changed.
2015-10-15 14:05:16 +00:00
Julia Reynolds
3afdd41772 am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit 'cad75a2636ea53017686d6d565c60e92cdfac161':
  Update volume slider on device changed.
2015-10-15 13:59:47 +00:00
Julia Reynolds
627bc805b8 am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit 'ae5a53d78cac72b73574b874a4d12ae9de708101':
  Update volume slider on device changed.
2015-10-15 13:48:21 +00:00
Julia Reynolds
ae5a53d78c Merge "Update volume slider on device changed." into mnc-dr-dev 2015-10-15 13:44:04 +00:00
Jun Mukai
1db5397d88 Allow changing mouse pointer icon for the current context.
Right now, it only supports I-beam on EditText, but further
rules will come in the future.

The png files for the icons are from chromium.

Bug: 24180385
Change-Id: I8de4ec8a5412b4830c08aa232c5083841c5c751c
2015-10-15 01:47:29 -07:00
Dianne Hackborn
85525040dd am 1e46ee93: am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '1e46ee937c94247ab0fe2b0ff1e2b9b26a9f02fa':
  Docs only change: update build version docs.
2015-10-15 03:21:28 +00:00
Chris Craik
18a759df06 Throw IndexOutOfBoundsException for invalid start/count values
bug:24878587

Change-Id: I2f1a68ebbc546a2d7fc3a3eacfaf1333371b2a0c
2015-10-14 18:52:11 -07:00
Dianne Hackborn
1e46ee937c am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '522222bc9bbfb6d62e101eaa6af2668277143e19':
  Docs only change: update build version docs.
2015-10-15 01:16:00 +00:00