Commit Graph

6966 Commits

Author SHA1 Message Date
Filip Gruszczynski
ba785dfcbc am 76173cc8: am b0edb78e: am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit '76173cc89f6a6499d82692ead1e38660f5f1deca':
  Support for devices with a chin.
2015-05-22 00:31:56 +00:00
Filip Gruszczynski
91e5b0f598 Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev 2015-05-22 00:02:48 +00:00
Yohei Yukawa
44d6e19fb9 am 882dcd5a: am 9360da99: am c0a9cd44: Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
* commit '882dcd5a40163342ea88e18f4597e6665da25237':
  Do not clear IMM#mCurRootView in IMM#finishInputLocked().
2015-05-21 22:28:51 +00:00
Yohei Yukawa
c0a9cd440d Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev 2015-05-21 21:47:36 +00:00
Yohei Yukawa
0f3a99d837 Do not clear IMM#mCurRootView in IMM#finishInputLocked().
This is a follow up CL for I219394178e4172bc47864297f1418e677dba.

As explained in the commit message of I219394178e4172bc47864297f,
IMM#mCurRootView needs to be synchronized with the actual window
focus more precisely to fix Bug 20820914. Hence we should not
clear IMM#mCurRootView in IMM#finishInputLocked() anymore.
Ideally this CL should have been included in the previous CL.

Manually tested following scenarios.
- Repro steps in Bug 6413553.  Made sure that IMM#mCurRootView
  is cleared after switching back from the current application to
  the previous application with back key.
- Test application that calls WebView#showFindDialog(). Made sure
  that LatinIME works fine when switching text fields.  This is
  non-trivial because android.webkit.FindActionModeCallback is
  changed in the previous CL I219394178e4172bc47864297f1418e677db.
- Repro steps in Bug 21144633.  Made sure that we can enter
  recipient's name in the messaging app.

This CL depends on I219394178e4172bc47864297f1418e677dba25e5.

Bug: 20820914
Change-Id: Id6afc8fc64512225578c62557b96c7dc2e969adf
2015-05-21 21:34:07 +00:00
Clara Bayarri
601ab83968 am 99eff791: am aadd31ff: am b5611f55: Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
* commit '99eff791df039bd0e43e9c82452ca383406dcfd9':
  Update the documentation for ActionMode.Callback2#onGetContentRect
2015-05-21 19:04:33 +00:00
Clara Bayarri
e95cc176bb Update the documentation for ActionMode.Callback2#onGetContentRect
Received feedback from a team that it was not clear what the rect
had to include.

Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1
2015-05-21 17:45:19 +01:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
2015-05-20 20:15:29 -07:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
2015-05-20 22:54:14 +00:00
Selim Cinek
302462938d am ab0c2b2a: am 671426f4: am d3f216d9: Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev
* commit 'ab0c2b2a415e7ffccc8d0e06466e24eb29ab2a52':
  Fixed that touches where incorrectly consumed when fullscreen
2015-05-20 22:48:06 +00:00
Selim Cinek
d3f216d921 Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev 2015-05-20 22:21:38 +00:00
Selim Cinek
f83e824216 Fixed that touches where incorrectly consumed when fullscreen
The fake window that was added when View.SYSTEM_UI_FULL_SCREEN was
set consumed all touches, even those going to the SystemUI and not
just those of windows below. The input consumer is now correctly
positioned in the window order to only capture the right touches.
Clicks to the volume panel and the heads up now correctly go to the
right place instead of just unhiding the SystemUI bars.

Bug: 21089476
Change-Id: Ib53dfc0b33b70084ca607d0f044db30b6e6c91d6
2015-05-20 22:20:17 +00:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
John Reck
e7be22d8a9 am a7455b63: am 198a2b02: am 97bf518f: Merge "Reduce wasted buffer allocations" into mnc-dev
* commit 'a7455b638edfc5d02a4295576bca871c09b322a5':
  Reduce wasted buffer allocations
2015-05-20 14:54:44 +00:00
John Reck
e2355020d8 am b2d91b7f: am a420e3ad: am 4430f16c: Merge "Fix whitespace in TextureView" into mnc-dev
* commit 'b2d91b7f6a76c9cdf4f315a2fa0663d3fbae668b':
  Fix whitespace in TextureView
2015-05-20 14:54:36 +00:00
John Reck
93611a01de am be9a3190: am 10a024bf: am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev
* commit 'be9a31903ef0617915c377c8da7cbf88a22f5cc5':
  Fix NPE in setSurfaceTexure
2015-05-20 14:54:31 +00:00
John Reck
97bf518f7b Merge "Reduce wasted buffer allocations" into mnc-dev 2015-05-20 14:23:24 +00:00
John Reck
4430f16ced Merge "Fix whitespace in TextureView" into mnc-dev 2015-05-20 14:22:59 +00:00
John Reck
35e04a1adf Merge "Fix NPE in setSurfaceTexure" into mnc-dev 2015-05-20 14:22:41 +00:00
John Reck
5ba09488d6 Fix whitespace in TextureView
Change-Id: I22396b7205dc2b9cf0eda5bd8aa951cad8d8bd87
2015-05-20 07:21:51 -07:00
John Reck
8bc511e4eb Fix NPE in setSurfaceTexure
Bug: 20088412
Change-Id: I9b78636a7d89438c8924bb1bf2adba00e74366eb
2015-05-20 07:21:44 -07:00
Yigit Boyar
a92f85e861 am 08cec07f: am 3c9b4bb2: am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '08cec07f8e1f9f6fb3675d6dfaae8bb2229f4183':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-20 13:14:40 +00:00
Yigit Boyar
bf6d1ebc4b am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '9b7167937ab5ea456c45e735d3bd749ccf49c432':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-19 23:15:48 +00:00
Dianne Hackborn
237f4b3d3d am 98e45457: am f24a522c: am 2d9c6015: Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev
* commit '98e454575cc2038088aedd2a2a7cb01bf8b8e8af':
  Fix issue #20679383: Add text style to assist.ViewNode...
2015-05-19 23:04:33 +00:00
Yohei Yukawa
f7c40d34a4 am e97ecba7: am fae01126: am c2cc6fff: Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev
* commit 'e97ecba7f45bd9824f7d6f3db24de6470cfa506f':
  Keep IMM#mCurRootView synchronized with the actual window focus.
2015-05-19 23:03:18 +00:00
John Reck
63005e6e5b Reduce wasted buffer allocations
Bug: 20170924

Don't pre-allocate buffers if there is a SurfaceView or other
View that has requested transparent regions. This doesn't fully
address the problem of allocating buffers when there's a full
screen SurfaceView but it at least gets back to KitKat levels
of only having 1 wasted buffer instead of 3 (the 1 being
a result of the fact that it will still draw one frame of emptiness
forcing a buffer dequeue).

Change-Id: Ied9553186bc7b111d180b63f87b92bd317cb4b97
2015-05-19 15:00:13 -07:00
Dianne Hackborn
2d9c6015b3 Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev 2015-05-19 18:26:28 +00:00
Dianne Hackborn
02beb41c97 Fix issue #20679383: Add text style to assist.ViewNode...
...from text nodes in WebView

Add a new explicit API for setting the text style information associated
with a view structure.

Also, how about some documentation!

Change-Id: Ia948b2d66382b973d0d00a67172a281ad55ce592
2015-05-19 11:18:16 -07:00
Yohei Yukawa
c2cc6fff1b Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev 2015-05-19 16:52:26 +00:00
Abodunrinwa Toki
bd007bd0d3 am 56546bd8: am 785c0a02: am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
* commit '56546bd8838dd6792dd7296df4263bb1c7796ec9':
  Hide floating toolbar when user interacts with screen.
2015-05-19 14:40:44 +00:00
Abodunrinwa Toki
1f21d2a8b1 Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 2015-05-19 14:06:46 +00:00
Abodunrinwa Toki
fd3a3a1163 Hide floating toolbar when user interacts with screen.
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
  toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
  is changing.

Bug: 20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
2015-05-19 14:25:39 +01:00
Adam Powell
d0337cd2ba am ac6122c0: am 5418cde8: am f9a0d44d: Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev
* commit 'ac6122c042678d680b6e31273178ac00f9a55116':
  Migrate uses of config_windowIsRound to Configuration.isScreenRound
2015-05-19 01:37:01 +00:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +00:00
Vladislav Kaznacheev
0df3a7b9d2 am 7c953911: am e1c3cebf: am 10e23977: am d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit '7c953911fb73a51641d2afec1c917d927f5a3d9e':
  Make VPA.setInterpolator(null) unset the interpolator.
2015-05-19 00:29:38 +00:00
Vladislav Kaznacheev
10e23977bd am d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit 'd2368d07a71fa77edc07be4ada89f70065bc940f':
  Make VPA.setInterpolator(null) unset the interpolator.
2015-05-18 23:54:08 +00:00
Yigit Boyar
21cdbd298d Revert "Make VPA.setInterpolator(null) unset the interpolator."
This reverts commit 58ae164100.

Change-Id: I6d9942b41694f6a5e6c211df839aa385eea0c496
2015-05-18 23:38:41 +00:00
Adam Powell
01f280d376 Migrate uses of config_windowIsRound to Configuration.isScreenRound
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.

Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.

Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
2015-05-18 16:07:42 -07:00
Adam Powell
3245c48f98 am e9182222: am dc9ca092: am 98465f99: Merge "Add Configuration data for round displays" into mnc-dev
* commit 'e918222288ca1071aac6ece66d4c63202f8d468b':
  Add Configuration data for round displays
2015-05-18 22:05:09 +00:00
Adam Powell
49e7ff9647 Add Configuration data for round displays
Add round values to the screenLayout field for Configuration
and a convenience method to check roundness.

Plumb this through the DisplayManager, making roundness the property
of a DisplayAdapter. The built-in main display will read the
configuration resource config_mainBuiltInDisplayIsRound to determine
its roundness. Device-specific resource overlays should set this to
true for devices with round primary displays.

By default, this config resource inherits from the existing
config_windowIsRound value currently used by some Android Wear
device configurations.

This change awaits another for aapt/native resources code to make the
resource filtering system aware of this property.

Change-Id: I1daced7ca6d6e172789e7c32bebfd43753bfa2ae
2015-05-18 14:13:33 -07:00
Alan Viverette
eaf87a3f68 am 05e58407: am 72fd6186: am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
* commit '05e58407650c6a2d9dfc3130f15c38104baa823d':
  Invalidate old accessibility bounds on CONTENT_CHANGE
2015-05-15 20:50:53 +00:00
Alan Viverette
6e1e7e4edd am fbd69c4e: am a4954e9b: am 2cc4a475: Merge "Adjust light source for window position" into mnc-dev
* commit 'fbd69c4e60c4f3ac519a00453d13fdb73c5beb34':
  Adjust light source for window position
2015-05-15 20:28:07 +00:00
Alan Viverette
2a576d9ec1 Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev 2015-05-15 20:11:20 +00:00
Vladislav Kaznacheev
58ae164100 Make VPA.setInterpolator(null) unset the interpolator.
Bug:21199392
Change-Id: Iae4b82254ddf6b60d442258e79ff0ea4d54c0a4d
2015-05-15 13:01:32 -07:00
Alan Viverette
2cc4a4755f Merge "Adjust light source for window position" into mnc-dev 2015-05-15 18:31:54 +00:00
Alan Viverette
a7ea65e239 Invalidate old accessibility bounds on CONTENT_CHANGE
Bug: 20950124
Change-Id: Id19924358b538f9b7754de3a0c019433817dc1fc
2015-05-15 11:30:21 -07:00
Yohei Yukawa
5f05965f54 Keep IMM#mCurRootView synchronized with the actual window focus.
Currently IMM#mCurRootView is always cleared every time when
IMM#finishInputLocked() is called.  We have been doing this since
Iad09cf5dbb7f6f156fd39ed243431432e00f8945 so as not to hold the
strong reference to a DecorView so long time (Bug 6413553).

Strictly speaking, the attached window may continue holding
input focus even after IMM#finishInputLocked() is called.
In this state IMM#focusIn() might have unexpectedly rejected
focus-in event but presumably this might not be obvious, or might
not occur at all because in some situations IMM#finishInputLocked()
has never been called even when the attached view loses input
focus.

In order to fix Issue 20820914, however, we need to call
IMM#finishInputLocked() exactly when the attached view loses
input focus.  To make it easier to diagnose any unexpected
regressions, this CL only changes the handling of
IMM#mCurRootView, while the next CL Id6afc8fc64512225578c62557b96
plumbs IMM#focusOut() to IMM#finishInputLocked().

Manually tested following scenarios.
- Repro steps in Bug 6413553.  Made sure that IMM#mCurRootView
  is cleared after switching back from the current application to
  the previous application with back key.
- Test application that calls WebView#showFindDialog(). Made sure
  that LatinIME works fine when switching text fields.  This is
  non-trivial because android.webkit.FindActionModeCallback is
  changed in this CL.
- Repro steps in Bug 21144633.  Made sure that we can enter
  recipient's name in the messaging app.

Bug: 20820914
Change-Id: I219394178e4172bc47864297f1418e677dba25e5
2015-05-15 10:22:23 -07:00
George Mount
a074cba204 am 274d9951: am e4ac47c6: am b1f12933: Merge "Remove hidden/deleted APIs." into mnc-dev
* commit '274d9951ec3863818a2b61380df04da74dc4c409':
  Remove hidden/deleted APIs.
2015-05-15 16:57:40 +00:00
George Mount
b1f1293355 Merge "Remove hidden/deleted APIs." into mnc-dev 2015-05-15 14:08:19 +00:00
Alan Viverette
50210d9129 Adjust light source for window position
Bug: 16523629
Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf
2015-05-14 18:05:36 -07:00