OSDN Git Service
Katie McCormick [Mon, 12 Nov 2012 20:10:05 +0000 (12:10 -0800)]
am
c1291f70: am
c5b47cff: resolved conflicts for merge of
7f9a0535 to jb-mr1-dev
* commit '
c1291f700a537a18b9123ad626ae1a4ab008a9f5':
Doc change: GCM category & dry_run params
Katie McCormick [Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)]
am
c5b47cff: resolved conflicts for merge of
7f9a0535 to jb-mr1-dev
* commit '
c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5':
Doc change: GCM category & dry_run params
Jeff Sharkey [Mon, 12 Nov 2012 18:32:11 +0000 (10:32 -0800)]
am
282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev
* commit '
282e9fc62e571aba741ddc9523d6dfe2eca313b6':
Avoid recycling recently removed user IDs.
Jeff Sharkey [Mon, 12 Nov 2012 18:32:08 +0000 (10:32 -0800)]
am
bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev
* commit '
bc0edecb7372a9ddf7644cb694c131b76ace8c41':
Increase readability of connectivity event log.
Jeff Sharkey [Mon, 12 Nov 2012 18:30:00 +0000 (10:30 -0800)]
Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev
Jeff Sharkey [Mon, 12 Nov 2012 18:28:33 +0000 (10:28 -0800)]
Merge "Increase readability of connectivity event log." into jb-mr1.1-dev
Justin Koh [Mon, 12 Nov 2012 18:20:32 +0000 (10:20 -0800)]
Merge "Make tap events less sensitive." into jb-mr1-aah-dev
Ben Pietrzak [Mon, 12 Nov 2012 18:11:52 +0000 (10:11 -0800)]
Make tap events less sensitive.
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
Katie McCormick [Mon, 12 Nov 2012 18:07:09 +0000 (10:07 -0800)]
resolved conflicts for merge of
7f9a0535 to jb-mr1-dev
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
John Spurlock [Mon, 12 Nov 2012 15:55:24 +0000 (07:55 -0800)]
am
f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
* commit '
f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
Disable navbar searchlight if search assist not available.
John Spurlock [Mon, 12 Nov 2012 15:52:02 +0000 (07:52 -0800)]
Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
The Android Open Source Project [Mon, 12 Nov 2012 15:28:38 +0000 (07:28 -0800)]
am
725a2ffe: Reconcile with jb-mr1-release - do not merge
* commit '
725a2ffe3b615515acd14b8b379078930de64249':
When in vibrate mode, all notifications will vibrate.
The Android Open Source Project [Mon, 12 Nov 2012 15:26:14 +0000 (07:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637
David Agnew [Sat, 10 Nov 2012 19:52:38 +0000 (11:52 -0800)]
am
7259d88c: am
4c0fc03b: When in vibrate mode, all notifications will vibrate.
* commit '
7259d88c08df220095a4aeaa752bd8e1055f4e83':
When in vibrate mode, all notifications will vibrate.
David Agnew [Sat, 10 Nov 2012 19:49:51 +0000 (11:49 -0800)]
am
4c0fc03b: When in vibrate mode, all notifications will vibrate.
* commit '
4c0fc03b5ed396d19035ee6a77a70189a0fba31a':
When in vibrate mode, all notifications will vibrate.
David Agnew [Sat, 10 Nov 2012 04:03:26 +0000 (23:03 -0500)]
When in vibrate mode, all notifications will vibrate.
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)
Bug:
7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
Ed Heyl [Sat, 10 Nov 2012 06:53:24 +0000 (22:53 -0800)]
am
4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev
* commit '
4f017e757bdc87d603d135386c888118fc2653ba':
When in vibrate mode, all notifications will vibrate.
David Agnew [Sat, 10 Nov 2012 04:03:26 +0000 (23:03 -0500)]
When in vibrate mode, all notifications will vibrate.
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
Ed Heyl [Sat, 10 Nov 2012 06:49:34 +0000 (22:49 -0800)]
Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev
Scott Main [Sat, 10 Nov 2012 06:42:13 +0000 (22:42 -0800)]
am
e72e2b74: am
85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
* commit '
e72e2b74bf5ae66524fc5d1872ba759b85728c65':
docs: update Tools landing page with info for developer options
Jeff Sharkey [Sat, 10 Nov 2012 06:42:06 +0000 (22:42 -0800)]
am
ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev
* commit '
ad08e6dcfc54556759a876106419b4169e9caffe':
Emit event log message when switching users.
Baligh Uddin [Sat, 10 Nov 2012 06:41:59 +0000 (22:41 -0800)]
am
df2670f1: am
ba52aff4: Import translations. DO NOT MERGE
* commit '
df2670f162dc7756899f4036750ba6866f5326c6':
Import translations. DO NOT MERGE
Andy McFadden [Sat, 10 Nov 2012 06:41:51 +0000 (22:41 -0800)]
am
798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev
* commit '
798de53cf454595a3a494d26dfa3f08518c24e55':
Reduce emulator logspam
Scott Main [Sat, 10 Nov 2012 05:01:49 +0000 (21:01 -0800)]
am
85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
* commit '
85abb087b9ffd05ff8ecc25575018f4a3fcb966d':
docs: update Tools landing page with info for developer options
David Agnew [Sat, 10 Nov 2012 04:03:26 +0000 (23:03 -0500)]
When in vibrate mode, all notifications will vibrate.
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
Scott Main [Sat, 10 Nov 2012 04:59:18 +0000 (20:59 -0800)]
Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
Scott Main [Sat, 10 Nov 2012 04:47:51 +0000 (20:47 -0800)]
docs: update Tools landing page with info for developer options
Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
Jeff Sharkey [Sat, 10 Nov 2012 01:23:21 +0000 (17:23 -0800)]
Merge "Emit event log message when switching users." into jb-mr1.1-dev
The Android Automerger [Sat, 10 Nov 2012 00:25:31 +0000 (16:25 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Fri, 9 Nov 2012 23:57:02 +0000 (15:57 -0800)]
Increase readability of connectivity event log.
Bug:
6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
Baligh Uddin [Fri, 9 Nov 2012 23:50:41 +0000 (15:50 -0800)]
am
ba52aff4: Import translations. DO NOT MERGE
* commit '
ba52aff41b602a68cbe7baed1aeb1adf42f34139':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 23:43:48 +0000 (15:43 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Andy McFadden [Fri, 9 Nov 2012 23:38:47 +0000 (15:38 -0800)]
Merge "Reduce emulator logspam" into jb-mr1.1-dev
Jeff Sharkey [Fri, 9 Nov 2012 23:00:31 +0000 (15:00 -0800)]
Emit event log message when switching users.
Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
Baligh Uddin [Fri, 9 Nov 2012 17:56:53 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I293bcd411943a50960328eb2ef836f4b9ba2295e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 17:55:52 +0000 (09:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2fe703076ce42275a0f36ba5c1982a76242df6fc
Auto-generated-cl: translation import
John Spurlock [Fri, 9 Nov 2012 15:27:33 +0000 (10:27 -0500)]
Disable navbar searchlight if search assist not available.
Bug:
7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
The Android Open Source Project [Fri, 9 Nov 2012 15:22:10 +0000 (07:22 -0800)]
am
18f95189: Reconcile with jb-mr1-release - do not merge
* commit '
18f95189727de29246b663ad4557075678217555':
The Android Open Source Project [Fri, 9 Nov 2012 15:19:26 +0000 (07:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef
The Android Automerger [Fri, 9 Nov 2012 01:53:27 +0000 (17:53 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Adam Cohen [Fri, 9 Nov 2012 00:41:31 +0000 (16:41 -0800)]
am
c1ae43ad: am
f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue
7502935)" into jb-mr1-dev
* commit '
c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8':
Preventing more than five widgets from being added in the carousel (issue
7502935)
Adam Cohen [Fri, 9 Nov 2012 00:41:27 +0000 (16:41 -0800)]
am
b82b3b57: am
3e9cba4f: Merge "Deferring size callbacks until boot completed (issue
7469267)" into jb-mr1-dev
* commit '
b82b3b5754305c36cfeb7c87816110da3c7b2ff4':
Deferring size callbacks until boot completed (issue
7469267)
Andy McFadden [Mon, 29 Oct 2012 23:42:41 +0000 (16:42 -0700)]
Reduce emulator logspam
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug
7436352
Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
Adam Cohen [Fri, 9 Nov 2012 00:39:16 +0000 (16:39 -0800)]
am
f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue
7502935)" into jb-mr1-dev
* commit '
f69320a1f02de3106a26a3911c25be63fcfaf738':
Preventing more than five widgets from being added in the carousel (issue
7502935)
Adam Cohen [Fri, 9 Nov 2012 00:39:13 +0000 (16:39 -0800)]
am
3e9cba4f: Merge "Deferring size callbacks until boot completed (issue
7469267)" into jb-mr1-dev
* commit '
3e9cba4f9db96e3b5ba2ab2f9ad7a7ac2549582d':
Deferring size callbacks until boot completed (issue
7469267)
Adam Cohen [Fri, 9 Nov 2012 00:35:45 +0000 (16:35 -0800)]
Merge "Preventing more than five widgets from being added in the carousel (issue
7502935)" into jb-mr1-dev
Adam Cohen [Fri, 9 Nov 2012 00:35:41 +0000 (16:35 -0800)]
Merge "Deferring size callbacks until boot completed (issue
7469267)" into jb-mr1-dev
Adam Cohen [Thu, 8 Nov 2012 21:01:08 +0000 (13:01 -0800)]
Deferring size callbacks until boot completed (issue
7469267)
-> Also bumping priority of the boot completed receiver
Change-Id: I7b68a29b4a8c927713bfbc1f4585f96ce0c47f35
The Android Open Source Project [Thu, 8 Nov 2012 22:22:27 +0000 (14:22 -0800)]
am
71a408b9: Reconcile with jb-mr1-release - do not merge
* commit '
71a408b9c5f2c071df8cd26f5c8c991cb50bbd96':
The Android Open Source Project [Thu, 8 Nov 2012 22:19:02 +0000 (14:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I3613cb7a8d96bd334e213ca318b5e121cbefbd48
The Android Automerger [Thu, 8 Nov 2012 21:54:05 +0000 (13:54 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Winson Chung [Thu, 8 Nov 2012 19:54:55 +0000 (11:54 -0800)]
Preventing more than five widgets from being added in the carousel (issue
7502935)
Change-Id: I26e6e154992e56b128d541578ffd3891776a3f7a
Dianne Hackborn [Thu, 8 Nov 2012 21:21:11 +0000 (13:21 -0800)]
am
63bc6c12: am
a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit '
63bc6c122d628ab24e332f58d3d7a59ea2627f85':
Remove extraneous logs.
Dianne Hackborn [Thu, 8 Nov 2012 21:18:29 +0000 (13:18 -0800)]
am
a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit '
a46a74fcd61d2b4e72b6027625a471f10b21b1c9':
Remove extraneous logs.
Dianne Hackborn [Thu, 8 Nov 2012 21:16:10 +0000 (13:16 -0800)]
Merge "Remove extraneous logs." into jb-mr1-dev
Daniel Sandler [Thu, 8 Nov 2012 21:13:56 +0000 (13:13 -0800)]
am
82b18e8d: am
9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '
82b18e8d5c4ceac56c4f5d6ca96f69e37a21eeb3':
Don't crash if no ECA.
Chris Wren [Thu, 8 Nov 2012 21:13:52 +0000 (13:13 -0800)]
am
f080dc0c: am
7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
* commit '
f080dc0c7d8d502046cb5274999279b3447e9585':
allow pattern linear layout to manage message_area.
Daniel Sandler [Thu, 8 Nov 2012 21:13:49 +0000 (13:13 -0800)]
am
38883bdd: am
4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
* commit '
38883bdd0088277771efca72c80e33773408d72e':
Only show the bouncer for the assistant if secure.
Dianne Hackborn [Thu, 8 Nov 2012 19:12:09 +0000 (11:12 -0800)]
Remove extraneous logs.
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
John Spurlock [Thu, 8 Nov 2012 21:13:45 +0000 (13:13 -0800)]
am
f6b6462f: am
14adfe42: Address comments from merged "Fix remaining jank in sec..."
* commit '
f6b6462f277689b7bb6b1f66cb5b57f30d1e194c':
Address comments from merged "Fix remaining jank in sec..."
John Spurlock [Thu, 8 Nov 2012 21:13:41 +0000 (13:13 -0800)]
am
baee9ed5: am
7a73344b: Minimal fix for stuck google now.
* commit '
baee9ed5643f45d6cf53f6360cc2b30fe59f55f0':
Minimal fix for stuck google now.
Jim Miller [Thu, 8 Nov 2012 21:13:38 +0000 (13:13 -0800)]
am
271add4e: am
899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
* commit '
271add4e09af034406188e13c3289e967108c84f':
Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
Michael Jurka [Thu, 8 Nov 2012 21:13:34 +0000 (13:13 -0800)]
am
47674796: am
eb963f04: Enforce max number of 5 lockscreen widgets
* commit '
47674796bc1ca3c2d0d154a107e8e29b51389bc5':
Enforce max number of 5 lockscreen widgets
Adam Cohen [Thu, 8 Nov 2012 21:13:30 +0000 (13:13 -0800)]
am
38515e9a: am
c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
* commit '
38515e9a4c4c5db5045b873842df594f50b12421':
Adding user activity when the challenge is slid down
Jim Miller [Thu, 8 Nov 2012 21:13:26 +0000 (13:13 -0800)]
am
6c7d2c24: am
e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
* commit '
6c7d2c248c53a50b2c7a8a4c1800a595755f3fc5':
Don't show ECA in landscape mode on phones.
Jim Miller [Thu, 8 Nov 2012 21:13:23 +0000 (13:13 -0800)]
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
Adam Powell [Thu, 8 Nov 2012 21:13:19 +0000 (13:13 -0800)]
am
2cfb9373: am
5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
* commit '
2cfb9373fa1e1f1be107a310c49ef68722544aa3':
add bouncer frame to glowpad.
Adam Powell [Thu, 8 Nov 2012 21:13:16 +0000 (13:13 -0800)]
am
f3eaabb9: am
a9fa92e8: Keyguard - force showing the status bar
* commit '
f3eaabb9321a202e79e30b7d7ceb828d4ece45b7':
Keyguard - force showing the status bar
Jim Miller [Thu, 8 Nov 2012 21:13:12 +0000 (13:13 -0800)]
am
e0dd7c46: am
2cacda5f: Disable interactive mode for full-screen security views in keyguard.
* commit '
e0dd7c463b6b62582c3f07c07f2f81da93e6412e':
Disable interactive mode for full-screen security views in keyguard.
Adam Cohen [Thu, 8 Nov 2012 21:13:09 +0000 (13:13 -0800)]
am
640cf0ab: am
1e0f6faf: Merge "Clean up some flashy jank (issue
7454766)" into jb-mr1-lockscreen-dev
* commit '
640cf0ab0a38888717febed818b015a8767a7010':
Clean up some flashy jank (issue
7454766)
Winson Chung [Thu, 8 Nov 2012 21:13:02 +0000 (13:13 -0800)]
am
18825966: am
70c2f873: Synchronizing bouncer duration with page scaling duration.
* commit '
1882596608062169b0155ccdfd634f6832c1b499':
Synchronizing bouncer duration with page scaling duration.
Daniel Sandler [Thu, 8 Nov 2012 21:12:53 +0000 (13:12 -0800)]
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.
Amith Yamasani [Thu, 8 Nov 2012 21:12:46 +0000 (13:12 -0800)]
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':
Adam Powell [Thu, 8 Nov 2012 21:12:42 +0000 (13:12 -0800)]
am
868edfde: am
e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit '
868edfdee6df34a0275c76e11ba3ca44e0327942':
Fiddle with keyguard glowpad layouts
Winson Chung [Thu, 8 Nov 2012 21:12:39 +0000 (13:12 -0800)]
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.
Jim Miller [Thu, 8 Nov 2012 21:12:35 +0000 (13:12 -0800)]
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
Daniel Sandler [Thu, 8 Nov 2012 21:12:32 +0000 (13:12 -0800)]
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.
Adam Powell [Thu, 8 Nov 2012 21:12:28 +0000 (13:12 -0800)]
am
75298e33: am
d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit '
75298e337a2c3655c6ff91572e56e575de766506':
Use stable layouts for keyguard/SlidingChallengeLayout
Jim Miller [Thu, 8 Nov 2012 21:12:25 +0000 (13:12 -0800)]
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
Daniel Sandler [Thu, 8 Nov 2012 21:12:21 +0000 (13:12 -0800)]
am
0e767b29: am
5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit '
0e767b2958a2dc47f062687a29e1be8f3c17a131':
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
Winson Chung [Thu, 8 Nov 2012 21:12:17 +0000 (13:12 -0800)]
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)
Adam Cohen [Thu, 8 Nov 2012 21:12:13 +0000 (13:12 -0800)]
am
efacf143: am
85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit '
efacf14349286916d7dfd904617cda659f93cf91':
Fixing up overscroll asset / sizing
Jim Miller [Thu, 8 Nov 2012 21:12:09 +0000 (13:12 -0800)]
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
Svetoslav Ganov [Thu, 8 Nov 2012 21:12:06 +0000 (13:12 -0800)]
am
0e538548: am
cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
* commit '
0e538548d75b97cfb3f29cce9c39e0ba65bbaa46':
Slide unlock cannot get accessibility focus.
Jim Miller [Thu, 8 Nov 2012 21:12:02 +0000 (13:12 -0800)]
am
b1938777: am
40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit '
b1938777afd8d7888779102ea2f3b5c0077c8f88':
Implement fallback clock in keyguard
Michael Jurka [Thu, 8 Nov 2012 21:11:58 +0000 (13:11 -0800)]
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
Adam Cohen [Thu, 8 Nov 2012 21:11:54 +0000 (13:11 -0800)]
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)
Adam Powell [Thu, 8 Nov 2012 21:11:50 +0000 (13:11 -0800)]
am
0fcb5cda: am
c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
* commit '
0fcb5cda5fcfc10af2dba032414c6ab9727b48f2':
Fix keyguard measurement bugs
Daniel Sandler [Thu, 8 Nov 2012 21:09:11 +0000 (13:09 -0800)]
am
9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
* commit '
9de5901bb37ad2a42d334405f41e629fa29dfd46':
Don't crash if no ECA.
Chris Wren [Thu, 8 Nov 2012 21:09:08 +0000 (13:09 -0800)]
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.
Daniel Sandler [Thu, 8 Nov 2012 21:09:05 +0000 (13:09 -0800)]
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.
John Spurlock [Thu, 8 Nov 2012 21:09:01 +0000 (13:09 -0800)]
am
14adfe42: Address comments from merged "Fix remaining jank in sec..."
* commit '
14adfe425e67c9ec12b0841a62c5c03ce00838ea':
Address comments from merged "Fix remaining jank in sec..."
John Spurlock [Thu, 8 Nov 2012 21:08:58 +0000 (13:08 -0800)]
am
7a73344b: Minimal fix for stuck google now.
* commit '
7a73344bbe1636fd01a8b551b0b539168a9a9987':
Minimal fix for stuck google now.
Jim Miller [Thu, 8 Nov 2012 21:08:55 +0000 (13:08 -0800)]
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.
Michael Jurka [Thu, 8 Nov 2012 21:08:51 +0000 (13:08 -0800)]
am
eb963f04: Enforce max number of 5 lockscreen widgets
* commit '
eb963f046dadd1304379db0b14c17e47c89913f4':
Enforce max number of 5 lockscreen widgets
Adam Cohen [Thu, 8 Nov 2012 21:08:48 +0000 (13:08 -0800)]
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
Jim Miller [Thu, 8 Nov 2012 21:08:45 +0000 (13:08 -0800)]
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.
Jim Miller [Thu, 8 Nov 2012 21:08:41 +0000 (13:08 -0800)]
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
Adam Powell [Thu, 8 Nov 2012 21:08:38 +0000 (13:08 -0800)]
am
5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
* commit '
5dd8b00891faff39ecadb1a0322e14528883bfe3':
add bouncer frame to glowpad.
Adam Powell [Thu, 8 Nov 2012 21:08:35 +0000 (13:08 -0800)]
am
a9fa92e8: Keyguard - force showing the status bar
* commit '
a9fa92e889a9dbc94c25e4ba1d67ce24929b834f':
Keyguard - force showing the status bar