2363 Commits

Author SHA1 Message Date
Adam Cohen
f69320a1f0 Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 2012-11-08 16:36:56 -08:00
Adam Cohen
3e9cba4f9d Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 2012-11-08 16:35:42 -08:00
Dianne Hackborn
55fdd58af8 am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
  Remove extraneous logs.
2012-11-08 15:58:52 -08:00
Daniel Sandler
0e4d6de103 am 77f2e27e: am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '77f2e27e68a851b5cec13e724645972df663d397':
  Don't crash if no ECA.
2012-11-08 15:58:48 -08:00
Daniel Sandler
11bf8e2c14 am 8d62faea: am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
* commit '8d62faea22e8974d72cd98dd7cd3f919504d7123':
  Only show the bouncer for the assistant if secure.
2012-11-08 15:58:37 -08:00
John Spurlock
17dcc0156c am 2a1e6a69: am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."
* commit '2a1e6a69a7713d588769693df96a7b8f2a6438c3':
  Address comments from merged "Fix remaining jank in sec..."
2012-11-08 15:58:32 -08:00
Michael Jurka
76f117da7e am 9d31d103: am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets
* commit '9d31d103b374e3327de13fdb954d400bd0abc628':
  Enforce max number of 5 lockscreen widgets
2012-11-08 15:58:15 -08:00
Adam Cohen
db5790d6e1 am 5d92a50e: am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
* commit '5d92a50efd069a3056fdf94d2673f3934378d213':
  Adding user activity when the challenge is slid down
2012-11-08 15:58:11 -08:00
Jim Miller
08bb2316f1 am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
  Add mechanism to kick keyguard to show the assistant
2012-11-08 15:58:03 -08:00
Adam Powell
34920823fc am 70eeec5c: am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
* commit '70eeec5c06db3bf38e94d95a284d393e79bf87a0':
  add bouncer frame to glowpad.
2012-11-08 15:57:58 -08:00
Adam Powell
44dd9b63c2 am 2f63c24e: am d7aaf3af: am f3eaabb9: am a9fa92e8: Keyguard - force showing the status bar
* commit '2f63c24e72a739fb143dd7d17a6964a2857244c5':
  Keyguard - force showing the status bar
2012-11-08 15:57:54 -08:00
Jim Miller
8f520143e6 am 8b26141a: am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.
* commit '8b26141a6cd7125978d52576a9c2c9d29a564837':
  Disable interactive mode for full-screen security views in keyguard.
2012-11-08 15:57:49 -08:00
Adam Cohen
23d5a1d715 am ee9bb25a: am 230719c7: am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
* commit 'ee9bb25a3a191d2808425d0635f2f3e36a8253dc':
  Clean up some flashy jank (issue 7454766)
2012-11-08 15:57:45 -08:00
Winson Chung
d2dd5d9fa1 am 462222fc: am 10bcc7d9: am 18825966: am 70c2f873: Synchronizing bouncer duration with page scaling duration.
* commit '462222fc5da2818a7ca7171eea4dbda7373ac99e':
  Synchronizing bouncer duration with page scaling duration.
2012-11-08 15:57:41 -08:00
Adam Powell
8d53e1bfcb am 805f386d: am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit '805f386d518b2c810cbb37f67f8eb4f42157e229':
  Fiddle with keyguard glowpad layouts
2012-11-08 15:57:28 -08:00
Winson Chung
77f740c1f1 am 60873dde: am 8c5ebad0: am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
* commit '60873ddec1901ae335fd018d7ee53055ba66aeaf':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
2012-11-08 15:57:24 -08:00
Jim Miller
dba631e43b am 87d6e4be: am 426348ae: am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
* commit '87d6e4be882a570144d98e43c4487e7900dbb839':
  Don't handle click events on the emergency button in bouncer mode
2012-11-08 15:57:20 -08:00
Adam Powell
5edb1fdd52 am 10bd6403: am b4c8cf6a: am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit '10bd6403b567b10db4bf2fed9082f4eab31457b0':
  Use stable layouts for keyguard/SlidingChallengeLayout
2012-11-08 15:57:08 -08:00
Daniel Sandler
4ea613235a am ebb0b118: am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit 'ebb0b118f18b97e18bb69c0fe12f252adcf2557c':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
2012-11-08 15:56:58 -08:00
Winson Chung
6044249b6b am 1540a21f: am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
* commit '1540a21f3d8fb5c1fcd7f1fcc8f4e63d644c27d1':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 15:56:54 -08:00
Adam Cohen
82f9474ed3 am bd8c736b: am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit 'bd8c736bfdef9072d55058cdc8ca4b661336778c':
  Fixing up overscroll asset / sizing
2012-11-08 15:56:46 -08:00
Jim Miller
3abe50956c am 2a72038a: am e7bb1f69: am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
* commit '2a72038ae26274776b01b508cae1d6477a4abce5':
  Add one more check for detecting crashes while inflating multiuser widget
2012-11-08 15:56:39 -08:00
Jim Miller
16ccfa2309 am 0927eb21: am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit '0927eb21125dd9438159b22ffff27c8fdbcbfedb':
  Implement fallback clock in keyguard
2012-11-08 15:56:31 -08:00
Michael Jurka
cb4d64562b am 27ecdf8e: am b40f9408: am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
* commit '27ecdf8e337df816fe546b5e63632fb83df1bfa8':
  Fix bug where newly added widget wasn't always shown
2012-11-08 15:56:27 -08:00
Adam Powell
fb1f00de2d am 605ada85: am d921f604: am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
* commit '605ada850a44cc9ca28c3358b5db304e03f27969':
  Fix keyguard measurement bugs
2012-11-08 15:56:19 -08:00
Chris Wren
aa45e2ebbc am 9ede3fd5: am 483483f8: am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
* commit '9ede3fd568ce22eee149b76eefeb20fe23770fe6':
  add logging to enableUserSelectorIfNecessary.
2012-11-08 15:55:44 -08:00
Chris Wren
eb7c28c4b0 am eac1e897: am 29cc9489: am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
* commit 'eac1e897bb939d6ce7cb987754939eb734e2cc24':
  add some defensive code to enableUserSelectorIfNecessary.
2012-11-08 15:55:40 -08:00
Adam Cohen
f131782479 am 6da1fdd1: am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
* commit '6da1fdd101334ff00090c73143b5bd97b2c93f34':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
2012-11-08 15:55:24 -08:00
Dianne Hackborn
e0d454d2e8 am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
  Remove extraneous logs.
2012-11-08 15:47:46 -08:00
Daniel Sandler
77f2e27e68 am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '9b15f2e57520d89fdd350a23ca97db36c3e5b7ca':
  Don't crash if no ECA.
2012-11-08 15:47:40 -08:00
Daniel Sandler
8d62faea22 am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
* commit 'c4639949d20077a58f92e675b16d45dabf964b0c':
  Only show the bouncer for the assistant if secure.
2012-11-08 15:47:33 -08:00
John Spurlock
2a1e6a69a7 am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."
* commit '180484115fcf061d6fbb5637d614d7c88d5d8053':
  Address comments from merged "Fix remaining jank in sec..."
2012-11-08 15:47:29 -08:00
Michael Jurka
9d31d103b3 am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets
* commit '1470297c4d0db5d90785b88c8ddf79119720bd42':
  Enforce max number of 5 lockscreen widgets
2012-11-08 15:47:17 -08:00
Adam Cohen
5d92a50efd am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
* commit '06b29549fb9819ed763c401ca471c051805fc7b4':
  Adding user activity when the challenge is slid down
2012-11-08 15:47:12 -08:00
Jim Miller
061b4fae3d am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
  Add mechanism to kick keyguard to show the assistant
2012-11-08 15:47:04 -08:00
Adam Powell
70eeec5c06 am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
* commit '79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b':
  add bouncer frame to glowpad.
2012-11-08 15:46:58 -08:00
Adam Powell
2f63c24e72 am d7aaf3af: am f3eaabb9: am a9fa92e8: Keyguard - force showing the status bar
* commit 'd7aaf3af31f2f16753883c263eb7812493a3b123':
  Keyguard - force showing the status bar
2012-11-08 15:46:51 -08:00
Jim Miller
8b26141a6c am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.
* commit '670f5a52b0a6c9c74541af06929152a54e53fe8b':
  Disable interactive mode for full-screen security views in keyguard.
2012-11-08 15:46:47 -08:00
Adam Cohen
ee9bb25a3a am 230719c7: am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
* commit '230719c7b5da0d36bd4e475cfba258011ab32d95':
  Clean up some flashy jank (issue 7454766)
2012-11-08 15:46:39 -08:00
Winson Chung
462222fc5d am 10bcc7d9: am 18825966: am 70c2f873: Synchronizing bouncer duration with page scaling duration.
* commit '10bcc7d95827884de2131fc316a24c9e6facee1e':
  Synchronizing bouncer duration with page scaling duration.
2012-11-08 15:46:36 -08:00
Adam Powell
805f386d51 am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
  Fiddle with keyguard glowpad layouts
2012-11-08 15:46:25 -08:00
Winson Chung
60873ddec1 am 8c5ebad0: am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
* commit '8c5ebad0033de401130d2367ec40d826691542ee':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
2012-11-08 15:46:21 -08:00
Jim Miller
87d6e4be88 am 426348ae: am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
* commit '426348ae8158f84c034310e08602362bd1a02072':
  Don't handle click events on the emergency button in bouncer mode
2012-11-08 15:46:18 -08:00
Adam Powell
10bd6403b5 am b4c8cf6a: am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit 'b4c8cf6ac473c33d946043b2e4cc9f7ba91dd8ce':
  Use stable layouts for keyguard/SlidingChallengeLayout
2012-11-08 15:46:11 -08:00
Daniel Sandler
ebb0b118f1 am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit '98a53594aebc86491641b44649d0178a7bec0d79':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
2012-11-08 15:46:03 -08:00
Winson Chung
1540a21f3d am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
  Fixing up overscroll asset / sizing
2012-11-08 15:45:55 -08:00
Jim Miller
2a72038ae2 am e7bb1f69: am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
* commit 'e7bb1f690e3e9d6406dd27390ec35a0a81922541':
  Add one more check for detecting crashes while inflating multiuser widget
2012-11-08 15:45:51 -08:00
Jim Miller
0927eb2112 am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
  Implement fallback clock in keyguard
2012-11-08 15:45:43 -08:00
Michael Jurka
27ecdf8e33 am b40f9408: am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
* commit 'b40f9408f59b06f75ffc7fbdcc6d833183d77d18':
  Fix bug where newly added widget wasn't always shown
2012-11-08 15:45:39 -08:00