Commit Graph

8366 Commits

Author SHA1 Message Date
Yohei Yukawa
bbf6a462fd Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 am: ef68474698
am: e5befc5221

* commit 'e5befc52219447de44bae1fe99d99cd43646316f':
  Make IMM more robust to spurious window focus-in

Change-Id: I0e391142d2b299b5dfcabb47b20ed45cd6c4f9aa
2016-05-25 05:04:59 +00:00
Yohei Yukawa
e5befc5221 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1
am: ef68474698

* commit 'ef684746980061bb5950ae2505229648d9f146d6':
  Make IMM more robust to spurious window focus-in

Change-Id: I77ae5953aa9afc64ef1cd3252d6d2ff936890b62
2016-05-25 05:02:09 +00:00
Yohei Yukawa
ef68474698 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I1d9a138798d982f2164907b49713a7b90cec9adc
2016-05-25 04:58:20 +00:00
Yohei Yukawa
8e9214b4bd Make IMM more robust to spurious window focus-in
InputMethodManager (IMM) has a latch switch named IMM#mHasBeenInactive
to forcefully refresh IME focus state when an inactive client
(IMM#mActive == false) is gaining window focus.  However, it turns out
that there is a race condition where the latch could be unexpectedly
turned off. This is probably what we have been chasing in bug 25373872.

Imagine the following scenario:

  1. An app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=false
  2. IMM inside the app receives MSG_SET_ACTIVE w/ active=false
  3. The app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=true
  4. The app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=false
  5. The app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=true

Here, our current strategy has been:
  A. Turn on the latch when MSG_SET_ACTIVE (w/active=false) is handled.
  B. Turn off the latch and ask IMMS to start input when
     MSG_WINDOW_FOCUS_CHANGED (w/ hasWindowFocus=true) is handled.

The problem is that in the step B IMMS can reject the request if
WindowManagerService (WMS) tells that the window in question no longer
has window focus. This is not surprising because the app is
just handling messages in the message queue sequentially.  As a result,
the IME focus is not updated expectedly in the step 5, because the latch
is no longer enabled as we expected.

With this CL, the latch will be re-enabled if the app fails to start
input while IMM#mActive is false as a short-term solution.

In future we may want to address this issue in protocol level so that
we can address other known issues such as bug 26851566 at the same time.

Bug: 28281870
Change-Id: I60adb38013b063918b074c7b947649eada77b2c8
2016-05-24 23:55:29 +00:00
Mady Mellor
e6a1b686c2 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 am: 12021f5020
am: a016449a83

* commit 'a016449a83e5fcccf0d2364c1143e958b564394f':
  Children should have backgrounds

Change-Id: I17fe77a79aabeab43b790a010afd87855ff6a5ce
2016-05-24 21:19:27 +00:00
Mady Mellor
a016449a83 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964
am: 12021f5020

* commit '12021f5020a057b3c0be8643bf5a8a999f488732':
  Children should have backgrounds

Change-Id: I5343b9b9aa4fb6c5e1f343cf5f4927c44bd5489d
2016-05-24 21:13:25 +00:00
Mady Mellor
470c001355 Merge "Children should have backgrounds" into nyc-dev
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I4c123a7cf9efd38c46ff155a70f5b9c053e4df02
2016-05-24 21:09:33 +00:00
Mady Mellor
12021f5020 Merge "Children should have backgrounds" into nyc-dev
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I1f68467af9048b93631c33243f4a2dd2e67ccf81
2016-05-24 21:08:17 +00:00
Mady Mellor
b0a824687f Children should have backgrounds
To add a background to children of a group, a couple of things
are changed when a group is in the expanded state:
- The parent's shadow + background is removed
- The group header is given a background and elevation
- The children are elevated to cast a shadow and have backgrounds
- When it's fully expanded the dividers won't be shown
- There's extra height added to the parent so that the child
  may cast the bottom shadow of the group
- As the children move into the bottom stack the last visible
  one alters its height and the ones below it are hidden
  to achieve the clipping effect

Fixes: 27591195
Fixes: 28655641
Change-Id: I0484308843e9b8bc10391387e54de07973a48f7d
2016-05-24 11:39:12 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Phil Weaver
ea45ad0c08 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d
am: f2b72b3a9d

* commit 'f2b72b3a9d1576da77cfe1f7c38648c2c4e90314':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ic796c5149995c616e3d57b9ebf1f6d9f288dc07c
2016-05-19 22:04:01 +00:00
Phil Weaver
df5056d531 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: I943fbc2e585ea6aaa234965dacacbf88104944a1
2016-05-19 21:57:55 +00:00
Phil Weaver
f2b72b3a9d Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ie5bfa1fcee7ec463190ef73311f20f3a6f087e82
2016-05-19 21:57:12 +00:00
Phil Weaver
227d33439d Merge "Fix a11y crash when window layer isn't unique." into nyc-dev 2016-05-19 21:50:29 +00:00
Phil Weaver
adaafb2980 Fix a11y crash when window layer isn't unique.
TalkBack is seeing crashes that I can only explain by our assumption
that window layer is unique in all cases. TalkBack reports that it
happens during animation, so I assume that the layer may repeat
transiently.

Reducing our dependence on this assumption by traversing the list of
windows sorted by layer without assuming that the list has the same
length as the list of unsorted windows.

Also documenting the undefined behavior of SparseArray when indexing
beyond its bounds. The undefined behavior itself is intentional for
performance reasons.

Bug: 28679528
Bug: 28815817
Change-Id: I0c9f90b0b458b4cde465f603ba204fe6691e5c2c
2016-05-19 13:32:24 -07:00
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
2016-05-19 15:12:30 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Jim Miller
e3a46d8e81 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev am: 0991ba5b01
am: a6ae8004c5

* commit 'a6ae8004c501f998818dc4af727b81dcc20de3f9':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: Ie28b7098c298daeabd35af3c0bfb6b88976ddc7a
2016-05-18 03:35:41 +00:00
Jim Miller
a6ae8004c5 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev
am: 0991ba5b01

* commit '0991ba5b01da4560116bebaa92e30fc97e7f2879':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: I52de480ef1a1efc335b215fdf21d9d29c05aa951
2016-05-18 03:19:58 +00:00
Jim Miller
0991ba5b01 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 2016-05-18 02:55:10 +00:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Jim Miller
f4c0a13170 Add fingerprint navigation to enable pulling down the statusbar
Change-Id: If0584358fd615ebd9df11614c662f4f287abf5c4
2016-05-17 18:11:52 -07:00
Chris Craik
661e4cb059 Merge "Document that SurfaceView is synchronous in N" into nyc-dev am: 0cfbb7643e am: 77f706980e
am: 44f88692b7

* commit '44f88692b7054be6eb3dfeed5bf428c8c36ece5f':
  Document that SurfaceView is synchronous in N

Change-Id: I62d5f1eed6441b99edb5054e8d6ee3858663bc38
2016-05-18 01:05:01 +00:00
Hangyu Kuang
47389bce2c Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 am: 993f685045
am: c936ef8af2

* commit 'c936ef8af23ae78e0f50a71c566f4d0fa1b56ea8':
  Hide HdrCapabilities constructor.

Change-Id: I168da49d4044cca71ae423813044682c17e692f7
2016-05-18 00:55:35 +00:00
Chris Craik
77f706980e Merge "Document that SurfaceView is synchronous in N" into nyc-dev
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I508585ec749b0a5d4e241757d655349b09b31566
2016-05-18 00:55:17 +00:00
TreeHugger Robot
0cfbb7643e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 2016-05-18 00:51:57 +00:00
Hangyu Kuang
993f685045 Merge "Hide HdrCapabilities constructor." into nyc-dev
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
2016-05-18 00:46:35 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
2016-05-17 16:17:25 -07:00
Hangyu Kuang
1e7d1aa6a6 Hide HdrCapabilities constructor.
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
2016-05-17 14:21:01 -07:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Wale Ogunwale
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
am: f5a87d86bf

* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
2016-05-17 01:10:44 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Jorim Jaggi
3a14fb7916 Handle multi-window for inset hint am: 23bf5462f0 am: b7bd18bdc6
am: bf9a7566df

* commit 'bf9a7566df02f7754ffeeba523cc904f73c0a45c':
  Handle multi-window for inset hint

Change-Id: I033c6ad295bf235d181ad0fbfe5025cdcad5b4c2
2016-05-16 23:38:00 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Jorim Jaggi
b7bd18bdc6 Handle multi-window for inset hint
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I6165730cf338d85f4e4a38d4115b9f4f299807b2
2016-05-16 23:26:53 +00:00
Jorim Jaggi
23bf5462f0 Handle multi-window for inset hint
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.

Bug: 28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
2016-05-16 23:18:14 +00:00
Vladislav Kaznacheev
f0c3721ac1 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 943c9f10d2
am: a19f5b640c

* commit 'a19f5b640c3713485c8813cb33f9a0f50d45a79c':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I5c964791ed64ff67dbc35dea23e40bd5b8801d03
2016-05-16 21:39:19 +00:00
Vladislav Kaznacheev
943c9f10d2 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I8b704c0cf3b4df430b0f5a322e1cee008e67d113
2016-05-16 21:26:04 +00:00
TreeHugger Robot
a423ec52ac Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 2016-05-16 21:21:58 +00:00
Vladislav Kaznacheev
c244970220 Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Make getX/getY return view-relative position as specified in the class
JavaDoc.

Fix obvious errors in JavaDoc for getX/getY

Bug: 28793547
Change-Id: Ic2ac646189711e7466594d4fc8326408fc0348e1
2016-05-16 12:57:15 -07:00
Yohei Yukawa
7e4ef1a319 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: a1c905caf3
am: c7aeaff113

* commit 'c7aeaff113ab3c525bab5ad79fce05ae895d93a7':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I188b8ebb263d67c1bdcefcd4e9fedf390a199969
2016-05-16 15:37:39 +00:00
Yohei Yukawa
a1c905caf3 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I76b607cd8086f421fc0d552a348a70fc06aa3d9c
2016-05-16 15:31:05 +00:00
Yohei Yukawa
cef3337cb5 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev 2016-05-16 15:22:21 +00:00
Abodunrinwa Toki
695f39de25 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 am: 03e7feeba3
am: 58056cf0bc

* commit '58056cf0bc57d3ac125ba8bd544c56270124c884':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: Iec7b1687ec8902b817c5a3367306465b8433da50
2016-05-16 09:50:03 +00:00