94583 Commits

Author SHA1 Message Date
Dave Burke
3e86f5432e am b85b9e48: am 1460a378: am 1b33342b: am 86e1b966: Fix ordering bug
* commit 'b85b9e481cbb7361a9f39c07600522ff8e534992':
2012-10-31 19:45:31 -07:00
Adam Powell
3119c00db7 am 055f001f: am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
* commit '055f001f76950e4a504a6bea059310a455281134':
  Fix keyguard bugs
2012-10-31 19:45:27 -07:00
Michael Jurka
24e9f3448a am 1ba20a67: am 7b1deee1: am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
* commit '1ba20a670dec03998d50290de06dc18828df5b6c':
  Fix crash on boot
2012-10-31 19:45:23 -07:00
Jim Miller
21c9c6a87b am 0b063f31: am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '0b063f31035b98d20899468f5f71c0d577b16d0c':
  Re-enable transition animation between face unlock and backup
2012-10-31 19:45:19 -07:00
Jim Miller
873d6e911c am 99e8692a: am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit '99e8692ace643f2e6a41530dc05411f707e0394b':
  Fix potential null pointer exeption in keyguard
2012-10-31 19:45:15 -07:00
Svetoslav Ganov
f66d2593c9 am 412a92cf: am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
* commit '412a92cfe28e74602bd2e9f0af378118a619aad8':
  Lockscreen accessibility - strings.
2012-10-31 19:45:11 -07:00
Svetoslav Ganov
5b522e3d0b am 3f909ed0: am 253cbc43: am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '3f909ed0e1ba134fe8c8ca15b0cae0115f9348f7':
2012-10-31 19:45:08 -07:00
Ed Heyl
44ee9ad79e am 770cf002: am aa5f5a22: am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit '770cf0023ed67ddb53af95dec0c79b8b8fb8b809':
2012-10-31 19:45:04 -07:00
Amith Yamasani
ef8390bfe5 am 1f3d76bd: am 1fa4fc55: am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
* commit '1f3d76bdaa2ebea5e7c91cb331e8a3600e841422':
2012-10-31 19:45:00 -07:00
Amith Yamasani
76b27e915a am 87ef92bf: am d505aa90: am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
* commit '87ef92bf9380b0c9fb5f373459ea206db5e47ebb':
  QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 19:44:55 -07:00
Dave Burke
b85b9e481c am 1460a378: am 1b33342b: am 86e1b966: Fix ordering bug
* commit '1460a378246d88924d9ebd0bc27840ba40d4f536':
2012-10-31 19:42:00 -07:00
Adam Powell
055f001f76 am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
* commit '45d2f164877a8bfd4e99666b00d56169b23ff979':
  Fix keyguard bugs
2012-10-31 19:41:55 -07:00
Michael Jurka
1ba20a670d am 7b1deee1: am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
* commit '7b1deee1554ca8f4a4d6d79091eea7358a1b3bce':
  Fix crash on boot
2012-10-31 19:41:51 -07:00
Jim Miller
0b063f3103 am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '2bf287c884f18e0f5c18c738d2d9b42d34323857':
  Re-enable transition animation between face unlock and backup
2012-10-31 19:41:46 -07:00
Jim Miller
99e8692ace am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit 'c3ab855a35bafcf3138316fc8d20c2a3933d40f5':
  Fix potential null pointer exeption in keyguard
2012-10-31 19:41:40 -07:00
Svetoslav Ganov
412a92cfe2 am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
* commit 'acb544dda8861b7da84c8c078d87a7a713f363a8':
  Lockscreen accessibility - strings.
2012-10-31 19:41:36 -07:00
Svetoslav Ganov
3f909ed0e1 am 253cbc43: am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '253cbc43323ff52fdb731d4867b4886207d5a655':
2012-10-31 19:41:32 -07:00
Ed Heyl
770cf0023e am aa5f5a22: am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit 'aa5f5a22754db00be8b7d4fd7fb9c36a5ad393ed':
2012-10-31 19:41:30 -07:00
Amith Yamasani
1f3d76bdaa am 1fa4fc55: am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
* commit '1fa4fc558173d2491b06eed272c8cc848d575109':
2012-10-31 19:41:26 -07:00
Amith Yamasani
87ef92bf93 am d505aa90: am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
* commit 'd505aa908812a8e05b12ceee63ccdf7f0957fbf9':
  QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 19:41:24 -07:00
Dave Burke
1460a37824 am 1b33342b: am 86e1b966: Fix ordering bug
* commit '1b33342b0099f285e7465cd7947d55d1c09c7e37':
2012-10-31 19:36:30 -07:00
Adam Powell
45d2f16487 am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
* commit 'e74fcc0eb15a0ea16d55e03c80a8442e09e16aee':
  Fix keyguard bugs
2012-10-31 18:38:06 -07:00
Michael Jurka
7b1deee155 am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
* commit '3c416dfcc0a4692b20a09f188284d9127dd5dbca':
  Fix crash on boot
2012-10-31 18:38:03 -07:00
Jim Miller
2bf287c884 am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '162fc8e64be6a6c357d39d36906ac7e36f07ed33':
  Re-enable transition animation between face unlock and backup
2012-10-31 18:37:59 -07:00
Jim Miller
c3ab855a35 am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit 'e0ec5d428f80fe49b291a0e0edd51a4398bde609':
  Fix potential null pointer exeption in keyguard
2012-10-31 18:37:55 -07:00
Svetoslav Ganov
acb544dda8 am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
* commit '8ea7cbe6f338b3dad2817eeca437221eede4298f':
  Lockscreen accessibility - strings.
2012-10-31 18:37:51 -07:00
Svetoslav Ganov
253cbc4332 am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '4a85b9f36cb180453298eec7f4a55de37586907b':
2012-10-31 18:37:47 -07:00
Ed Heyl
aa5f5a2275 am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit '1f928787eebefedef944708f99515fabfcc4a201':
2012-10-31 18:37:44 -07:00
Amith Yamasani
1fa4fc5581 am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
* commit 'd2f616f224b2731778c187dba4ecfa3a1a2e7869':
2012-10-31 18:37:39 -07:00
Amith Yamasani
d505aa9088 am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
* commit '7277d5d97f2b873582dbd60a63a22da452d96ff9':
  QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 18:37:34 -07:00
Chet Haase
f5750fbe27 am 0ed9f7d7: am 4af84142: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
* commit '0ed9f7d7fd449bd384bf31a36a59dd3c4d0151eb':
  Fix for regression in WindowManager orientation changes
2012-10-31 16:55:34 -07:00
Chet Haase
0ed9f7d7fd am 4af84142: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
* commit '4af84142e08dd082ac5a0f94adb8c6df83589e2e':
  Fix for regression in WindowManager orientation changes
2012-10-31 16:53:55 -07:00
Chet Haase
4af84142e0 am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
* commit 'fe28ff0d063818762dd585a67fcffd61cabd5a2f':
  Fix for regression in WindowManager orientation changes
2012-10-31 16:51:23 -07:00
Jeff Brown
6f0888864a am 5c43c889: am 427279fb: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit '5c43c88945945fbf833b05d2ed851d5e43bef4b5':
  Fix dream/keyguard infinite layout loop.
2012-10-31 16:50:49 -07:00
Chet Haase
fe28ff0d06 Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev 2012-10-31 16:49:12 -07:00
Jeff Brown
5c43c88945 am 427279fb: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit '427279fb4d55caf61c88d90b8f348dfc915fbe20':
  Fix dream/keyguard infinite layout loop.
2012-10-31 16:48:09 -07:00
Jeff Brown
427279fb4d am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit 'c1c53e56fb5222bfdd17f0a9f735efe5c1b8cb70':
  Fix dream/keyguard infinite layout loop.
2012-10-31 16:45:37 -07:00
Jeff Brown
c1c53e56fb Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 2012-10-31 16:42:26 -07:00
Raph Levien
097d818ceb am 06da2423: am 54385d91: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
* commit '06da2423c55bc2a61b42cdc34c0c20800fdd4977':
  Fix for bug 7400445 regression in background drawable
2012-10-31 16:41:59 -07:00
Baligh Uddin
ae89c3449b am 8994804c: am 0abea6d6: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '8994804c7d4665634c677af8425c5b6e84a0343a':
  Revert "Removed symbol causing compile breakage."
2012-10-31 16:41:55 -07:00
Baligh Uddin
ed7b276937 am 2a825941: (-s ours) am ff26fc74: (-s ours) am 83e9187d: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '2a8259416fd7d0231b7e6602662319ae10dd70c4':
  Revert "Import translations. DO NOT MERGE"
2012-10-31 16:41:52 -07:00
Baligh Uddin
58e0b20b9a am 8a1faba8: (-s ours) am 94a69e34: (-s ours) am a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8a1faba89c58538920946950a162322e96859b2a':
  Import translations. DO NOT MERGE
2012-10-31 16:41:48 -07:00
Raph Levien
06da2423c5 am 54385d91: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
* commit '54385d91f0a0ddfd1ded9e94e43f979f99765f43':
  Fix for bug 7400445 regression in background drawable
2012-10-31 16:39:09 -07:00
Baligh Uddin
8994804c7d am 0abea6d6: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '0abea6d6e78758e225f4e0b1fcd3b92be1c4e63b':
  Revert "Removed symbol causing compile breakage."
2012-10-31 16:39:03 -07:00
Baligh Uddin
2a8259416f am ff26fc74: (-s ours) am 83e9187d: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit 'ff26fc74fef8dd946a593d42684f5d705c8ca357':
  Revert "Import translations. DO NOT MERGE"
2012-10-31 16:39:02 -07:00
Baligh Uddin
db636e69f1 am fce1cc9a: am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
* commit 'fce1cc9a6cb0a7591bacdca2beeaf917674a4adc':
  Removed symbol causing compile breakage.
2012-10-31 16:33:45 -07:00
Baligh Uddin
8a1faba89c am 94a69e34: (-s ours) am a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '94a69e34583100d993b9a74a314ee09e7db87faa':
  Import translations. DO NOT MERGE
2012-10-31 16:33:35 -07:00
Baligh Uddin
fce1cc9a6c am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
* commit 'f3820b139e7a79df959c977cb83324639652c11a':
  Removed symbol causing compile breakage.
2012-10-31 16:31:25 -07:00
Raph Levien
54385d91f0 am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
* commit 'c01d1045ef6c79000afc6f07a74ee7963a2092ac':
  Fix for bug 7400445 regression in background drawable
2012-10-31 16:28:08 -07:00
Baligh Uddin
0abea6d6e7 am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '9e3a900c35d6af749d0c363dadf627384eed687a':
  Revert "Removed symbol causing compile breakage."
2012-10-31 16:28:05 -07:00