Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,419 Commits 3 Branches 0 Tags
05fd162d5aa14f57777951b676da517fcc158b21
Commit Graph

64377 Commits

Author SHA1 Message Date
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
cb89ac84c6 Merge "Support for devices with a chin." into cw-d-mr1-dev 2015-05-20 22:41:44 +00:00
Cedric Ho
782def772a am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting. 
* commit '80cf2210226bc652181abafe606b69ebce63af78':
  Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
 2015-05-20 21:56:27 +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
Cedric Ho
80cf221022 Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting. 
Change-Id: Ic40d90f1a7a9942f5e82080668552239bbed9b03
 2015-05-20 13:50:22 -07: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
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 2614bd225f.

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
Bryce Lee
f626c679fd am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'a7f07fc35ba647465503fe0cba3d4521b68d89c1':
  Add configuration to allow animations during low power mode.
 2015-04-30 20:01:02 +00:00
Bryce Lee
a7f07fc35b Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 2015-04-30 19:44:49 +00: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
Bryce Lee
023de22cf2 Add configuration to allow animations during low power mode. 
On Android Wear, the stream ui needs to continue to be animated during
low power mode.

Bug: 20696607
Change-Id: I24a87eba8d86169d04a72012e0311357622db00a
 2015-04-29 18:34:44 -07:00
Joshua Schwarz
a4edc82e9b am 4547dac0: Fix one-off error in reporting. 
* commit '4547dac01f3136393cc708bb49ff546413a45d6c':
  Fix one-off error in reporting.
 2015-04-28 18:28:18 +00:00
Joshua Schwarz
4547dac01f Fix one-off error in reporting. 
Change-Id: I5315e3d13b42285169e6c92cfcf9cf2ae9667018
 2015-04-27 18:37:34 -07:00
Cedric Ho
0af3af0397 am 991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev 
* commit '991c8c53aff32f3d605f6715b3fa78a86990f7ff':
  Enable VoiceInteractionService on watch.
 2015-04-27 16:41:33 +00:00
Cedric Ho
991c8c53af Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev 2015-04-27 15:47:28 +00: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 57307b21cb.

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 73e239bdc9.

Bug: 20091132
 2015-04-24 14:44:54 -07:00
Cedric Ho
c663d99f00 Enable VoiceInteractionService on watch. 
Change-Id: I1d23ba55a98f6d68942cc344b4a564ab62285656
 2015-04-24 14:38:25 -07:00
Leon Scroggins III
38b84b6d76 am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '60d7c9fcbcb80c556689f03c7b00984f94f9912b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 18:16:29 +00:00
Leon Scroggins III
60d7c9fcbc am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '6db29a92452c2a837528d20d024dcacefd450c17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:54:50 +00:00
Leon Scroggins III
6db29a9245 am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'f828f43f97f4a018e2224e926b900713081a8c5b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:43:23 +00: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
Leon Scroggins III
f828f43f97 am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:32:59 +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
Leon Scroggins III
38cf068c04 am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:43 +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
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +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
Justin Koh
593389501f am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit 'ba75135a807c87f4d6c14e69b1246eabd39f4117':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 00:53:38 +00:00
ztenghui
2947926ce8 am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '059451e18504d6fbbedacaeefe0f2b62b355104d':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 00:53:34 +00:00
Justin Koh
ba75135a80 am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 00:43:16 +00:00