48050 Commits

Author SHA1 Message Date
Filip Gruszczynski
aabc9869a9 am 03850591: Handle outsets when resized is called due to rotation.
* commit '03850591954faf5280fd581dd04cd6958eda0124':
  Handle outsets when resized is called due to rotation.
2015-07-02 00:47:48 +00:00
Filip Gruszczynski
0385059195 Handle outsets when resized is called due to rotation.
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.

Bug: 22209764

Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
2015-07-01 10:23:47 -07:00
Robert Schaub
e51d6d05e9 am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
* commit 'fae35eed99d6bc87f3a864bdd16d951136a16cc7':
  docs: Changed link in Java source code comment to repair 404
2015-06-30 20:26:36 +00: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
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
Robert Schaub
f64c80a6cd docs: Changed link in Java source code comment to repair 404
Need to find out what developer is in charge of CardEmulation.java to include
in review.

Bug: 19950839

Change-Id: Ic30ebaf69e46a70a64c8a123b0f72abaff7d0b80
2015-06-30 12:41:58 -07:00
Anthony Hugh
a50fa71044 am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '001df9ca900f3098222a4920a0048d2eb947bd4e':
  DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:27:41 +00:00
Anthony Hugh
001df9ca90 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-06-24 16:13:19 -07:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
2015-06-15 22:39:12 +00:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan.
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
2015-06-15 22:11:30 +00:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan.
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
2015-06-15 17:24:57 +00:00
Filip Gruszczynski
94476be6a4 am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '88bc9753c30c9ab3c92d074ae49520cfa2258b16':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
2015-06-12 16:29:39 +00:00
Doris Liu
629ba0e2b3 DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.

Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
(cherry picked from commit d7444427d9f44b6b7448d4c21edca866132c8b59)
2015-06-10 22:54:09 +00:00
Filip Gruszczynski
93634166c8 am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
  ActivityView: set surface on a background thread.
2015-06-02 22:36:42 +00:00
Filip Gruszczynski
d88e4d50d6 Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 2015-06-02 22:26:39 +00:00
Jeff Brown
65f6996add am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE
* commit 'eb4bd19ef09b2c277347b08c4a050f01f686c9c2':
  Terminate loop properly when cursor window is full. DO NOT MERGE
2015-06-02 03:33:31 +00:00
Jeff Brown
eb4bd19ef0 Terminate loop properly when cursor window is full. DO NOT MERGE
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
(cherry picked from commit bb8c841e909a2fb967db2ad3b9f8b058f9b849e8)
2015-06-02 00:00:34 +00:00
Filip Gruszczynski
2df62bf0dd ActivityView: set surface on a background thread.
ActivityView shouldn't set the surface on the main thread, because it's
a binder call and causes jank. Instead it should delegate the call to a
background thread and let it do the work there.

Bug: 15752100

Change-Id: I6f2764c93dfb8f3e00d79f0e97d4a6688b6fdd8f
2015-06-01 13:24:12 -07:00
Filip Gruszczynski
11d50c9cc6 am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.
2015-06-01 18:57:21 +00:00
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off.
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
2015-06-01 10:09:45 -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
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
Yigit Boyar
21cdbd298d Revert "Make VPA.setInterpolator(null) unset the interpolator."
This reverts commit 58ae164100060d1b8a9709aeea7a2b488ff0ac98.

Change-Id: I6d9942b41694f6a5e6c211df839aa385eea0c496
2015-05-18 23:38:41 +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
John Reck
951f23478d am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit 'd955dceb4f38f214e62024e808b2b1a21be41940':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 01:05:47 +00:00
John Reck
d955dceb4f am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 00:51:07 +00:00
John Reck
862540cdb1 Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 2015-05-14 00:40:45 +00:00
John Reck
e869835d6a am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6':
  DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 22:07:15 +00:00
John Reck
a5b28b92b1 am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
  DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 21:52:50 +00:00
John Reck
25607a6642 Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.

Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 2015-05-13 21:42:13 +00:00
Christopher Ferris
a7f27a7673 am 504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '504bb9e7709cd51500b68f4220fffb61e11a5e1b':
  Temporarily increase saved tombstone size. DO NOT MERGE
2015-05-07 19:29:02 +00:00
Christopher Ferris
808a8d9c30 Temporarily increase saved tombstone size. DO NOT MERGE
Bug: 20829534
Change-Id: I2af16d342196da1acda43b0f6d7341413ef51820
2015-05-07 10:31:17 -07:00
Gus Prevas
12b1b8ed3b am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '026e204ee461e101fe251742f6ffb09b1747c804':
  Fixes velocity tracking bug in SwipeDismissLayout.
2015-04-30 15:42:03 +00:00
Gus Prevas
026e204ee4 Fixes velocity tracking bug in SwipeDismissLayout.
This is the framework version of ag/682710.
Original change description:
This change adds a missing call to offsetLocation() when tracking
swipe velocities on a SwipeDismissLayout.  This bug was causing
incorrect velocities to be measured which often resulted in an
incorrectly interpreted leftward swipe cancelling the dismiss
gesture.

Bug: 20350515
Change-Id: I4f3e3668a1f9aab963fdfa9095a43f4c5344703f
2015-04-30 11:14:14 -04:00
Wale Ogunwale
cc9c597dad am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"
2015-04-24 22:26:04 +00:00
Wale Ogunwale
d639a45324 am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3 am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"
2015-04-24 22:14:56 +00:00
Wale Ogunwale
1d646128b2 Revert "[ActivityManager] Improve multi-thread access the same provider"
This reverts commit 57307b21cbdb261eeca081051ed61540dcf905f8.

Bug: 20091132
2015-04-24 14:45:14 -07:00
Wale Ogunwale
67fe0a450c Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit 73e239bdc9493d81215d5afe739b3ed095686ba2.

Bug: 20091132
2015-04-24 14:44:54 -07:00
Mark Renouf
f237bce8c3 am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '99d4930064e7d155ce92746028cbafd46b14c6f4':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:42:01 +00:00
Mark Renouf
99d4930064 am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:31:31 +00:00
Mark Renouf
55555a3dab Fixes rejected dismiss gestures (framework version of ag/677161)
Gus's original change description:

This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.

Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not.  At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.

In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.

BUG: 20542762

(Same as b/20350515 but for Activity dismissal at the system level.)

Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
2015-04-24 11:47:27 -04:00
Svet Ganov
2fd6dda03e am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 22:19:04 +00:00
Joe Fernandez
1009c8de23 am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
* commit '92ae292e864287abcb1a78c117263f64b303b885':
  docs: Add text to JavaDocs regarding browser file access vulnerability
2015-04-23 17:45:19 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:18:10 +00:00
Joe Fernandez
22b5ba8c01 docs: Add text to JavaDocs regarding browser file access vulnerability
b/17420682

Change-Id: Ic03b51778280570be65ae933fd906b140acdf023
2015-04-22 17:29:12 -07:00