Commit Graph

7104 Commits

Author SHA1 Message Date
Anthony Hugh
66cba90940 am 773f1b2f: am 26fa501d: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '773f1b2f919bb4c1f2724eabe8480b6589d8c498':
  DO NOT MERGE: Introduce stem keycodes for Wear
2015-07-15 21:08:39 +00:00
Anthony Hugh
26fa501dd6 DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
2015-07-15 13:34:25 -07:00
Adrian Roos
8ca082c74b am 0dc7f44c: am 1ec13f18: am 4dfeea4f: am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
* commit '0dc7f44c1f454f57e344084c5631c6c3b9727c0e':
  Fix black keyguard / missing status bar
2015-07-10 00:59:31 +00:00
Adrian Roos
1ec13f1837 am 4dfeea4f: am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
* commit '4dfeea4f2243b7824ca56fa8906e12c90ce979ab':
  Fix black keyguard / missing status bar
2015-07-10 00:29:03 +00:00
Adrian Roos
4d8134c1b9 Merge "Fix black keyguard / missing status bar" into mnc-dev 2015-07-10 00:01:20 +00:00
Adrian Roos
76d2fe4288 Fix black keyguard / missing status bar
The status bar window was stuck in the READY_TO_SHOW state
because it was not policy visible, whereas the policy
was waiting for the window to become HAS_DRAWN.

Now BarController also updates states if the window
is READY_TO_SHOW, which in turn allows the window to
become visible and HAS_DRAWN.

Bug: 22072099
Change-Id: I1836c276723ee2205d7d5759be079f02aaa23e2e
2015-07-09 16:09:48 -07:00
Alan Viverette
b5491bcc2f am 6bd2e985: am 5f3b4eea: am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit '6bd2e98584db1416a369760d02a4c0f18eea516d':
  Add missing break in AccessibilityEvent.eventTypeToString()
2015-07-09 18:50:31 +00:00
Alan Viverette
5f3b4eeae1 am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit 'ec12d8ea174b63442a901f64bf147d79c68d21e7':
  Add missing break in AccessibilityEvent.eventTypeToString()
2015-07-09 17:43:18 +00:00
Alan Viverette
5d3d23199d Add missing break in AccessibilityEvent.eventTypeToString()
Bug: 22331852
Change-Id: I6f75dde0fb29715d05ef8e8b0e16c3a5a2b9d5e8
2015-07-09 09:51:46 -07:00
Filip Gruszczynski
5e16aa5164 am b52df916: am d705f355: am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
* commit 'b52df916207ac831b9b7e525fd967a4796a39a3a':
  Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:49:24 +00:00
Filip Gruszczynski
d705f35568 am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
* commit '45eb3ea667dac8d97a91781f01875148bacfe74c':
  Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:22:04 +00:00
Filip Gruszczynski
45eb3ea667 Revert "Fix NPE when requesting outsets for detached view."
This reverts commit b010291ace.

Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
2015-07-09 01:06:40 +00:00
Filip Gruszczynski
93c4f91594 am c72a5821: am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view.
* commit 'c72a582138c1db297c662e5f83ce6a2e97f8bf69':
  Fix NPE when requesting outsets for detached view.
2015-07-09 00:45:37 +00:00
Filip Gruszczynski
886fd2f5a0 am b010291a: Fix NPE when requesting outsets for detached view.
* commit 'b010291ace13947fcc76b1a64eaa67880e15f0a6':
  Fix NPE when requesting outsets for detached view.
2015-07-09 00:15:25 +00:00
Filip Gruszczynski
b010291ace Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit e660d4e96a)
2015-07-08 23:22:36 +00:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
2015-07-08 01:39:53 +00:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist.
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
2015-07-07 16:47:37 -07:00
Chris Craik
7f6a33039a am b5892a41: am 93d7725b: am 268ad521: am 6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev
* commit 'b5892a4156c446d875838cce3404579d8f066ca3':
  Don't update DisplayLists when dumping
2015-07-07 19:47:16 +00:00
Chris Craik
6ef57e9741 Merge "Don't update DisplayLists when dumping" into mnc-dev 2015-07-07 18:42:15 +00:00
Chris Craik
356b5fe086 Don't update DisplayLists when dumping
bug:22234438

Updating the displaylist is invalid since this debug method isn't
called on the UI thread, and it defeats the purpose of seeing what
the hierarchy is currently rendering.

Change-Id: I10c5cc6dbae8d304559dfc6e863b0ede158d554f
2015-07-07 10:39:39 -07:00
Dianne Hackborn
7a90c53631 am bcbf4641: am 569984f2: am d178b2da: am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
* commit 'bcbf46419075a1bd132839a0e4d559de31a61f92':
  Add easy way to get device idle whitelist.
  Don't prevent windows from drawing when they are just moving
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
  Avoid IllegalStateException when generating/importing keys.
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
  Unhide signal strength constants used by getLevel.
2015-07-06 23:10:20 +00:00
Jorim Jaggi
c5af4f8421 Don't prevent windows from drawing when they are just moving
Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
2015-07-06 21:12:49 +00:00
Chris Craik
5242e2c947 am 5b0fb51e: am e29b4b11: am e8dab95b: am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
* commit '5b0fb51ef4254c8dd45a988a2772415e163f4f91':
  Clearer message when failing to draw a SW layer
2015-07-06 21:04:40 +00:00
Chris Craik
74fed61233 Merge "Clearer message when failing to draw a SW layer" into mnc-dev 2015-07-06 20:29:57 +00:00
George Mount
d931f16cd7 am 673f5920: am 9c4531e0: am e61668cb: am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev
* commit '673f592061eb654a84f0f3fa2f48e51d29a32870':
  Fix docs for ViewAnimationUtils.createCircularReveal
2015-07-06 15:47:31 +00:00
Filip Gruszczynski
2b5a6842fd am cc7fa77e: am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev
* commit 'cc7fa77e25e63b79a827816b7eea37bacedf5bff':
  Calculate outset hint when adding window.
2015-07-01 22:06:05 +00:00
John Reck
9bccbf84e9 am 20ff6cd2: am a4ac386d: Merge "Make querying the graphics stats service more defensive" into mnc-dev
* commit '20ff6cd2581a6850b4df5939f96e394a898461be':
  Make querying the graphics stats service more defensive
2015-07-01 22:05:58 +00:00
George Mount
9488294611 Fix docs for ViewAnimationUtils.createCircularReveal
Bug 22202425

Change-Id: Ic9b5b8ec88b8ae2ece2312e3bc3d4fd49ffc1f1f
2015-07-01 11:10:58 -07:00
Chris Banes
a50db6c626 am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
* commit 'c9812040941dad43ca0892bd4dd5e8cf9a219f07':
  Fix memory leak in setActionProvider() - framework edition
2015-07-01 17:11:40 +00:00
Filip Gruszczynski
d40c423b1c Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev 2015-07-01 17:03:03 +00:00
John Reck
a4ac386d2a Merge "Make querying the graphics stats service more defensive" into mnc-dev 2015-07-01 16:56:09 +00:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Yohei Yukawa
aefe8e4d75 am 93ed9858: am 63c4a718: Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev
* commit '93ed98580c151ec28952ec4d72010b24b55a3583':
  Reland "Fixed constant window switching on lock screen..."
2015-07-01 01:06:47 +00:00
Yohei Yukawa
63c4a7185c Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 2015-07-01 00:51:36 +00:00
Yohei Yukawa
d1a092218b Reland "Fixed constant window switching on lock screen..."
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.

Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.

Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
2015-06-30 16:22:05 -07:00
Chet Haase
1ee7dc939f am 58517a20: am 081ddbe2: Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
* commit '58517a20011dfe777d75e2c16f6d47230e0a67b3':
  Invalidate parent when scrolling child view back onto screen
2015-06-30 23:05:36 +00:00
Chet Haase
081ddbe296 Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev 2015-06-30 22:46:44 +00:00
Chris Craik
2aa56c5428 Clearer message when failing to draw a SW layer
bug:21376603

Change-Id: I7433491c16c5bc95cffc8e35aac07eb551be9c8e
2015-06-30 15:33:44 -07:00
Chet Haase
1b7f8f99c3 Invalidate parent when scrolling child view back onto screen
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.

Issue #21413554  offsetTopAndBottom requires invalidating parent when view becomes visible again

Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
2015-06-30 15:33:30 -07:00
Filip Gruszczynski
2987f616fa resolved conflicts for merge of 300ccf4a to mnc-dev
Change-Id: Ia315e314bfde0c066a2c25d93f8cbdc71fee0a14
2015-06-30 15:03:30 -07:00
Chris Craik
bfb3afcad9 am 20d54457: am ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev
* commit '20d544571168cad62db4d86c91b3dfde7c13a342':
  Don't display layout bounds of GONE views
2015-06-30 21:40:51 +00:00
Chris Craik
ca985b54c8 Merge "Don't display layout bounds of GONE views" into mnc-dev 2015-06-30 21:22:26 +00:00
Chris Craik
a1dab8bb0f Don't display layout bounds of GONE views
bug:22126532

Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
2015-06-30 13:51:26 -07:00
Filip Gruszczynski
300ccf4ab5 am 0ec1328f: Calculate outset hint when adding window.
* commit '0ec1328f85a08a610868856c688ebb8196c79c17':
  Calculate outset hint when adding window.
2015-06-30 20:20:48 +00:00
John Reck
828698b012 Make querying the graphics stats service more defensive
Bug: 21750734

Doesn't fix the underlying issue that we were unable to
get a buffer but as this is non-critical be more defensive
about failures.

Change-Id: I7f2faaa35b064e3d0da0a13dba9aae3c226b9acc
2015-06-30 12:57:42 -07:00
Filip Gruszczynski
0ec1328f85 Calculate outset hint when adding window.
Outsets aren't dynamic so they are a great candidate for a hint when the
window is added through the window manager. Thanks to this during first
view hierarchy measure or wallpaper window layout they are immediately
available and don't require multiple measure/layout passes.

Bug: 21593814
Change-Id: I573c15ffbbe4fcd8a6ed9c5e4fcd6cfbbcd7434f
2015-06-30 12:42:17 -07:00
Chris Banes
c8f6ecc265 Fix memory leak in setActionProvider() - framework edition
Caused by ActionMenuItem's SubUiVisibilityListener
not being nulled when it is replaced via setActionProvider().

BUG: 22189734
Change-Id: Id4deaa05cd5554ca7bdf969a592e4812e39dcb75
2015-06-30 11:17:57 +01:00
Jorim Jaggi
5d5740626b am 1d4419e3: am e85da2ba: Add accessibility event for assist disclosure
* commit '1d4419e3c2067151baa9010f8bda98653c43cfc8':
  Add accessibility event for assist disclosure
2015-06-30 00:49:35 +00:00
Jorim Jaggi
e85da2bad5 Add accessibility event for assist disclosure
Bug: 21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
2015-06-30 00:27:14 +00:00