Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,831 Commits 3 Branches 0 Tags
63ed1663dfa1efce442add8270e91bd28f14ee8a
Commit Graph

30164 Commits

Author SHA1 Message Date
Adam Cohen
1b19b519e6 am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit 'd50f206a08663c05dbe6c14918c6eef61df0bc97':
  Attempted fix for issue 7469415
 2012-11-08 15:31:57 -08:00
Jean-Baptiste Queru
7c8d2b63c0 Merge from jb-mr1-dev-plus-aosp 
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
 2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
8d3d0250c4 Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11' 
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
 2012-11-08 14:40:12 -08:00
Geremy Condra
8b73fc1ad3 am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev 
* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects
 2012-11-08 14:26:39 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a 
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
 2012-11-08 14:13:21 -08:00
Dianne Hackborn
72325cdb65 am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '63bc6c122d628ab24e332f58d3d7a59ea2627f85':
  Remove extraneous logs.
 2012-11-08 13:21:11 -08:00
Dianne Hackborn
63bc6c122d am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit 'a46a74fcd61d2b4e72b6027625a471f10b21b1c9':
  Remove extraneous logs.
 2012-11-08 13:18:29 -08:00
Dianne Hackborn
a46a74fcd6 Merge "Remove extraneous logs." into jb-mr1-dev 2012-11-08 13:16:10 -08:00
Dianne Hackborn
7ff30113de Remove extraneous logs. 
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
 2012-11-08 13:13:48 -08:00
Jim Miller
a2bf6181df am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 13:13:23 -08:00
Jim Miller
3a191b495c am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit 'f3add313dcbcda6711b441022fe340b412b7d1a0':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 13:12:25 -08:00
Svetoslav Ganov
8fa69381f2 am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '0e538548d75b97cfb3f29cce9c39e0ba65bbaa46':
  Slide unlock cannot get accessibility focus.
 2012-11-08 13:12:06 -08:00
Adam Cohen
24b1764e6c am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '9477f8dee1068f7b07713a33b18fd4aea6b5c039':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 13:11:54 -08:00
Jim Miller
2c29deaa26 am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 13:08:41 -08:00
Jim Miller
f3add313dc am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 13:07:46 -08:00
Svetoslav Ganov
0e538548d7 am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
  Slide unlock cannot get accessibility focus.
 2012-11-08 13:07:29 -08:00
Adam Cohen
9477f8dee1 am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 13:07:18 -08:00
Irfan Sheriff
8449bb0378 am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
  Stop supplicant and dhcp before start
 2012-11-08 06:18:47 -08:00
Romain Guy
18d9a26941 am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-08 06:18:40 -08:00
Eino-Ville Talvala
f0352e03fd am f4334f63: am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit 'f4334f63c5162035ead3b44131c48015dfc6be58':
  Camera: Document new video snapshot picture size behavior.
 2012-11-08 06:18:36 -08:00
Justin Koh
5d1a9a902e am 4608a0ae: am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 
* commit '4608a0aec230a1a4857b54354afc3f233af7c1f2':
  Support new touchpad event protocol.
 2012-11-08 06:18:15 -08:00
Justin Koh
b892e8c642 am a1459793: am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 
* commit 'a1459793d4e2ea483deb8baa733abbac56c2c199':
  Trigger Google Now intent with swipe from bottom
 2012-11-08 06:18:07 -08:00
Amith Yamasani
cb2f707f86 am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'cb5cb740b587744150df7414bdc2974144e9167a':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:17:59 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
 2012-11-08 06:14:33 -08:00
Romain Guy
a965fc5e8f am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-08 06:14:11 -08:00
Eino-Ville Talvala
f4334f63c5 am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
  Camera: Document new video snapshot picture size behavior.
 2012-11-08 06:14:01 -08:00
Justin Koh
4608a0aec2 am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 
* commit '41048d670d42075732723e72d7f303498690ea99':
  Support new touchpad event protocol.
 2012-11-08 06:12:30 -08:00
Justin Koh
a1459793d4 am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
  Trigger Google Now intent with swipe from bottom
 2012-11-08 06:12:26 -08:00
Amith Yamasani
cb5cb740b5 am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'aecee8a98543118dacec14a94052243754560e9d':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:12:21 -08:00
Jim Miller
4eeb4f664a Add mechanism to kick keyguard to show the assistant 
Fixes bug 7499778

Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
 2012-11-08 00:39:04 -08:00
Satoshi Kataoka
4424951fa5 am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-07 20:50:37 -08:00
Satoshi Kataoka
1e29e49cf8 Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 2012-11-07 20:48:01 -08:00
Jeff Brown
74da109102 Support Wifi display devices that rename themselves. 
Some Wifi display devices like to rename themselves after a
connection completes (or at other times).  Make sure to update
the name of the display when we detect that it changed in
our scan results.

This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.

Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.

Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
 2012-11-07 18:43:32 -08:00
Jim Miller
3c9297c3cb Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 2012-11-07 18:09:14 -08:00
Justin Koh
cd38c32d85 Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 2012-11-07 17:10:24 -08:00
Svetoslav Ganov
7ce0c13c0e Slide unlock cannot get accessibility focus. 
1. There are two overlaid views, one is the GlowPadView and the
   other is the SlidingChallengeLayout. Since the GlowPadView is
   on top of the other view it has to consume the hover events or
   they will be dispatched to the view behind it which results
   the the GlowPadView not getting accessibility focus.

bug:7496770

Change-Id: Iae3b1777e490c56e33560a016fc04a92226bfb66
 2012-11-07 15:55:02 -08:00
Ben Pietrzak
6b1d912b25 Catch exception of nonfound activities 
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
 2012-11-07 15:07:18 -08:00
Adam Cohen
3e66286f7c Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae Fixing up glowpad scaling issues (issue 7494378) 
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
 2012-11-07 14:43:33 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
 2012-11-07 13:08:25 -08:00
Daniel Sandler
ccbfd617e7 am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '7b5a92766a0b04af7cb6a9e9905ec37e7885ea64':
  Fix docs to refer to the correct class.
 2012-11-07 12:40:30 -08:00
Joe Malin
8d40d04afa Notification.java javadoc: addAction 
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
 2012-11-07 12:39:22 -08:00
Daniel Sandler
7b5a92766a am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
 2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81 Merge "Fix docs to refer to the correct class." into jb-mr1-dev 2012-11-07 12:35:01 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Romain Guy
de60dd2d13 am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit 'fcd7ad4e28df6a408e84c6d2b2f425b029efbfbe':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-07 11:22:43 -08:00
Romain Guy
fcd7ad4e28 am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-07 11:18:55 -08:00
Michael Jurka
5dc8ce48d8 am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit 'c70379347e2a1bc469da10149f8d443ab7c94468':
  Allowing rotation while adding lockscreen widgets
 2012-11-07 11:18:06 -08:00