90167 Commits

Author SHA1 Message Date
Daniel Sandler
e7689b82fa am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
* commit '3a54aaed02a79e589892389f1004ebcf3f8325be':
  Compress lockscreen's account login fallback to fit.
2012-11-08 13:12:53 -08:00
Amith Yamasani
fda5c8524d am 318d87fb: am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '318d87fb045ee6cce9e53d9bc13691b236b555c7':
2012-11-08 13:12:46 -08:00
Adam Powell
ef79efdc47 am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit '868edfdee6df34a0275c76e11ba3ca44e0327942':
  Fiddle with keyguard glowpad layouts
2012-11-08 13:12:42 -08:00
Winson Chung
8c5ebad003 am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
* commit '062e01c5f664bbbbff5d351eb4af0b56af3fa32d':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
2012-11-08 13:12:39 -08:00
Jim Miller
426348ae81 am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
* commit 'e9c881c66d7845dabb936e93939179ff87f72699':
  Don't handle click events on the emergency button in bouncer mode
2012-11-08 13:12:35 -08:00
Daniel Sandler
e8d02b315b am 1323fe3e: am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
* commit '1323fe3ed4768237992f0f48a7259e0801d5b4d6':
  New asset for assist affordance on lockscreen.
2012-11-08 13:12:32 -08:00
Adam Powell
b4c8cf6ac4 am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit '75298e337a2c3655c6ff91572e56e575de766506':
  Use stable layouts for keyguard/SlidingChallengeLayout
2012-11-08 13:12:28 -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
Daniel Sandler
98a53594ae am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit '0e767b2958a2dc47f062687a29e1be8f3c17a131':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
2012-11-08 13:12:21 -08:00
Winson Chung
29f161781c am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
* commit '27ed0c2d002587010456c87321902c276ae6e11a':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 13:12:17 -08:00
Adam Cohen
79d4bf6e2f am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit 'efacf14349286916d7dfd904617cda659f93cf91':
  Fixing up overscroll asset / sizing
2012-11-08 13:12:13 -08:00
Jim Miller
e7bb1f690e am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
* commit '4bd4b78f33f1cc564128f55ebfb3e27c1398b550':
  Add one more check for detecting crashes while inflating multiuser widget
2012-11-08 13:12:09 -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
Jim Miller
bb01e9b82f am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit 'b1938777afd8d7888779102ea2f3b5c0077c8f88':
  Implement fallback clock in keyguard
2012-11-08 13:12:02 -08:00
Michael Jurka
b40f9408f5 am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
* commit '090c790c1cf2036653b1725d130e220da0432d45':
  Fix bug where newly added widget wasn't always shown
2012-11-08 13:11:58 -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
Adam Powell
d921f60440 am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
* commit '0fcb5cda5fcfc10af2dba032414c6ab9727b48f2':
  Fix keyguard measurement bugs
2012-11-08 13:11:50 -08:00
Daniel Sandler
82b18e8d5c am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '9de5901bb37ad2a42d334405f41e629fa29dfd46':
  Don't crash if no ECA.
2012-11-08 13:09:11 -08:00
Chris Wren
f080dc0c7d am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
* commit '7d59cf9f10c38a020c7104e3bd5b358ab2144ab5':
  allow pattern linear layout to manage message_area.
2012-11-08 13:09:08 -08:00
Daniel Sandler
38883bdd00 am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
* commit '4eada64770bc2f021cb04cbb77efbad1c9a7adc4':
  Only show the bouncer for the assistant if secure.
2012-11-08 13:09:05 -08:00
John Spurlock
f6b6462f27 am 14adfe42: Address comments from merged "Fix remaining jank in sec..."
* commit '14adfe425e67c9ec12b0841a62c5c03ce00838ea':
  Address comments from merged "Fix remaining jank in sec..."
2012-11-08 13:09:01 -08:00
John Spurlock
baee9ed564 am 7a73344b: Minimal fix for stuck google now.
* commit '7a73344bbe1636fd01a8b551b0b539168a9a9987':
  Minimal fix for stuck google now.
2012-11-08 13:08:58 -08:00
Jim Miller
271add4e09 am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
* commit '899e6c738341698c71689e31630c0b8663057e44':
  Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
2012-11-08 13:08:55 -08:00
Michael Jurka
47674796bc am eb963f04: Enforce max number of 5 lockscreen widgets
* commit 'eb963f046dadd1304379db0b14c17e47c89913f4':
  Enforce max number of 5 lockscreen widgets
2012-11-08 13:08:51 -08:00
Adam Cohen
38515e9a4c am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
* commit 'c8ed8d32603d21e1af9a682cc5f1655d2388cfba':
  Adding user activity when the challenge is slid down
2012-11-08 13:08:48 -08:00
Jim Miller
6c7d2c248c am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
* commit 'e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc':
  Don't show ECA in landscape mode on phones.
2012-11-08 13:08:45 -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
Adam Powell
2cfb9373fa am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
* commit '5dd8b00891faff39ecadb1a0322e14528883bfe3':
  add bouncer frame to glowpad.
2012-11-08 13:08:38 -08:00
Adam Powell
f3eaabb932 am a9fa92e8: Keyguard - force showing the status bar
* commit 'a9fa92e889a9dbc94c25e4ba1d67ce24929b834f':
  Keyguard - force showing the status bar
2012-11-08 13:08:35 -08:00
Jim Miller
e0dd7c463b am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.
* commit '2cacda5fc92a28a44a37e25b96093a9cc1346080':
  Disable interactive mode for full-screen security views in keyguard.
2012-11-08 13:08:31 -08:00
Adam Cohen
640cf0ab0a am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
* commit '1e0f6faf5abea0aae49bdae973bd15b675817224':
  Clean up some flashy jank (issue 7454766)
2012-11-08 13:08:28 -08:00
Winson Chung
1882596608 am 70c2f873: Synchronizing bouncer duration with page scaling duration.
* commit '70c2f8736437ebb6073c3b6dab2e08e6dd9f39a6':
  Synchronizing bouncer duration with page scaling duration.
2012-11-08 13:08:24 -08:00
Daniel Sandler
3a54aaed02 am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
* commit '838195db8f69968690971977e4b615df39504465':
  Compress lockscreen's account login fallback to fit.
2012-11-08 13:08:17 -08:00
Amith Yamasani
318d87fb04 am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '9eacab8abee6b8d154f5de2513fcbaed313c4b24':
2012-11-08 13:08:09 -08:00
Adam Powell
868edfdee6 am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
  Fiddle with keyguard glowpad layouts
2012-11-08 13:08:06 -08:00
Winson Chung
062e01c5f6 am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
* commit '2635750fa7f835d102c3fd52b18e00d364d9ae42':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
2012-11-08 13:08:03 -08:00
Jim Miller
e9c881c66d am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
* commit 'ae0161e7af280a35e975dc26457ab4f704d37d0a':
  Don't handle click events on the emergency button in bouncer mode
2012-11-08 13:07:59 -08:00
Daniel Sandler
1323fe3ed4 am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
* commit '71b7d891fc95d360df7a52c7008c92859b9dfdb8':
  New asset for assist affordance on lockscreen.
2012-11-08 13:07:56 -08:00
Adam Powell
75298e337a am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit 'd8e2fdf7345f448f332ea8a551172f48563f77aa':
  Use stable layouts for keyguard/SlidingChallengeLayout
2012-11-08 13:07:50 -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
Daniel Sandler
0e767b2958 am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit '5c533884ead3bb8a8e2e4e8d79587a81dbe31700':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
2012-11-08 13:07:43 -08:00
Winson Chung
27ed0c2d00 am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 13:07:39 -08:00
Adam Cohen
efacf14349 am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
  Fixing up overscroll asset / sizing
2012-11-08 13:07:36 -08:00
Jim Miller
4bd4b78f33 am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
* commit '5da893c93b55c83b07558a1648f53dfec89b1f32':
  Add one more check for detecting crashes while inflating multiuser widget
2012-11-08 13:07:32 -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
Jim Miller
b1938777af am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
  Implement fallback clock in keyguard
2012-11-08 13:07:25 -08:00
Michael Jurka
090c790c1c am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
* commit 'fd8c388f028de046e5f5ed36880e98f67e6bb481':
  Fix bug where newly added widget wasn't always shown
2012-11-08 13:07:21 -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
Adam Powell
0fcb5cda5f am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
* commit 'c717d110ae5c2531a75420386f99ad8957732dbf':
  Fix keyguard measurement bugs
2012-11-08 13:07:14 -08:00
Eric Laurent
2b9888439d am 30717b68: Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev
* commit '30717b6881bba8460b041cf39848748c7657cff4':
  AudioService: undock audio glitch - DO NOT MERGE
2012-11-08 13:00:44 -08:00