OSDN Git Service
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: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
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: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:26:14 +0000 (07:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637
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
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 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
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
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: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
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: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: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
Dianne Hackborn [Thu, 8 Nov 2012 19:12:09 +0000 (11:12 -0800)]
Remove extraneous logs.
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
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
Jim Miller [Thu, 8 Nov 2012 21:08:31 +0000 (13:08 -0800)]
am
2cacda5f: Disable interactive mode for full-screen security views in keyguard.
* commit '
2cacda5fc92a28a44a37e25b96093a9cc1346080':
Disable interactive mode for full-screen security views in keyguard.
Adam Cohen [Thu, 8 Nov 2012 21:08:28 +0000 (13:08 -0800)]
am
1e0f6faf: Merge "Clean up some flashy jank (issue
7454766)" into jb-mr1-lockscreen-dev
* commit '
1e0f6faf5abea0aae49bdae973bd15b675817224':
Clean up some flashy jank (issue
7454766)
Winson Chung [Thu, 8 Nov 2012 21:08:24 +0000 (13:08 -0800)]
am
70c2f873: Synchronizing bouncer duration with page scaling duration.
* commit '
70c2f8736437ebb6073c3b6dab2e08e6dd9f39a6':
Synchronizing bouncer duration with page scaling duration.
Daniel Sandler [Thu, 8 Nov 2012 21:08:17 +0000 (13:08 -0800)]
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.
Amith Yamasani [Thu, 8 Nov 2012 21:08:09 +0000 (13:08 -0800)]
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':
Adam Powell [Thu, 8 Nov 2012 21:08:06 +0000 (13:08 -0800)]
am
e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
* commit '
e7e210cb4373877785130ff06ad4e6635592eaa8':
Fiddle with keyguard glowpad layouts
Winson Chung [Thu, 8 Nov 2012 21:08:03 +0000 (13:08 -0800)]
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.
Jim Miller [Thu, 8 Nov 2012 21:07:59 +0000 (13:07 -0800)]
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
Daniel Sandler [Thu, 8 Nov 2012 21:07:56 +0000 (13:07 -0800)]
am
71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
* commit '
71b7d891fc95d360df7a52c7008c92859b9dfdb8':
New asset for assist affordance on lockscreen.
Adam Powell [Thu, 8 Nov 2012 21:07:50 +0000 (13:07 -0800)]
am
d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
* commit '
d8e2fdf7345f448f332ea8a551172f48563f77aa':
Use stable layouts for keyguard/SlidingChallengeLayout
Jim Miller [Thu, 8 Nov 2012 21:07:46 +0000 (13:07 -0800)]
am
3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
* commit '
3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
Attempt to fix NegativeArraySizeException crash in keyguard
Daniel Sandler [Thu, 8 Nov 2012 21:07:43 +0000 (13:07 -0800)]
am
5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
* commit '
5c533884ead3bb8a8e2e4e8d79587a81dbe31700':
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
Winson Chung [Thu, 8 Nov 2012 21:07:39 +0000 (13:07 -0800)]
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)
Adam Cohen [Thu, 8 Nov 2012 21:07:36 +0000 (13:07 -0800)]
am
85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
* commit '
85c4281aae518c27ca3f95e330f6aa56159e1328':
Fixing up overscroll asset / sizing
Jim Miller [Thu, 8 Nov 2012 21:07:32 +0000 (13:07 -0800)]
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
Svetoslav Ganov [Thu, 8 Nov 2012 21:07:29 +0000 (13:07 -0800)]
am
cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
* commit '
cd1f3095056bd4148030f6f6c514387d623db800':
Slide unlock cannot get accessibility focus.
Jim Miller [Thu, 8 Nov 2012 21:07:25 +0000 (13:07 -0800)]
am
40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
* commit '
40962880225c74d8f776e6ce03f1ec6dde63ef04':
Implement fallback clock in keyguard
Michael Jurka [Thu, 8 Nov 2012 21:07:21 +0000 (13:07 -0800)]
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
Adam Cohen [Thu, 8 Nov 2012 21:07:18 +0000 (13:07 -0800)]
am
3e66286f: Merge "Fixing up glowpad scaling issues (issue
7494378)" into jb-mr1-lockscreen-dev
* commit '
3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
Fixing up glowpad scaling issues (issue
7494378)
Adam Powell [Thu, 8 Nov 2012 21:07:14 +0000 (13:07 -0800)]
am
c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
* commit '
c717d110ae5c2531a75420386f99ad8957732dbf':
Fix keyguard measurement bugs
Eric Laurent [Thu, 8 Nov 2012 20:57:26 +0000 (12:57 -0800)]
Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev
Eric Laurent [Thu, 8 Nov 2012 20:49:49 +0000 (12:49 -0800)]
Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev
The Android Open Source Project [Thu, 8 Nov 2012 17:48:48 +0000 (09:48 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5b5f12f167d5a0287dfd21c8f37f0f451c9242a4
Daniel Sandler [Thu, 8 Nov 2012 17:48:28 +0000 (09:48 -0800)]
Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 8 Nov 2012 17:42:54 +0000 (12:42 -0500)]
Don't crash if no ECA.
(Phone landscape pattern lock, for example.)
Bug:
7502613
Change-Id: I3f48c4351ea04db2d8ad9a410166f60257f3d954
Chris Wren [Thu, 8 Nov 2012 17:40:20 +0000 (09:40 -0800)]
Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
Chris Wren [Thu, 8 Nov 2012 17:28:15 +0000 (12:28 -0500)]
allow pattern linear layout to manage message_area.
Bug:
7501923
Change-Id: I5126e760d8567380e2041ca01791f14c7b054adb
Daniel Sandler [Thu, 8 Nov 2012 17:28:13 +0000 (09:28 -0800)]
Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
Amith Yamasani [Thu, 8 Nov 2012 17:27:23 +0000 (09:27 -0800)]
am
3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '
3fe2cb4db60827889abd1f971910f807ae346488':
Don't cancel any notifications that are meant for all users, if no package is specified.
Eric Laurent [Mon, 5 Nov 2012 22:54:12 +0000 (14:54 -0800)]
AudioService: undock audio glitch - DO NOT MERGE
merge from master:
"AudioService: improve low end dock audio control
Low end docks have a menu to enable use of audio
for media: automatically enabling/disabling use of audio
when the dock is connected/disconnected is useless
and can be the source of audio glitches.
Bug
7463620."
Change-Id: I3b7e7ebe660bb3f0e4367d2a3ed63ee76f78fe58
Daniel Sandler [Thu, 8 Nov 2012 14:58:27 +0000 (09:58 -0500)]
Only show the bouncer for the assistant if secure.
We do this by using the helpful tools in
KeyguardActivityLauncher which do all the right callbacks
and stuff.
(This assumes the assist gesture is sufficiently hard to
false that we don't need the extra step of bouncing the
glowpad unlock affordance.)
Bug:
7500637
Change-Id: Id68cb85cdfd741f43a5bce69118ec4209125d785
Eric Laurent [Fri, 2 Nov 2012 23:48:26 +0000 (16:48 -0700)]
audio service fix dock after crash - DO NOT MERGE
merge from master:
"audio service: set dock use on mediaserver restart
Restore forced usage of dock audio for media according to
current setting when media server restarts."
Bug
7485250.
Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
John Spurlock [Thu, 8 Nov 2012 15:29:26 +0000 (10:29 -0500)]
Address comments from merged "Fix remaining jank in sec..."
Cleanup based on post-merge comments on:
I554ddffb7981488fa8a81933842b0c7730e775f3
Bug:
7482560
Change-Id: I06b2bc91da9dfddd06db69efb9e7ad45c304f709
John Spurlock [Thu, 8 Nov 2012 14:08:14 +0000 (09:08 -0500)]
Minimal fix for stuck google now.
Bug:
7500409
Change-Id: I1570d72e08fbe520ac07eed2ee40b6571fa1fe3c
Jim Miller [Thu, 8 Nov 2012 10:31:07 +0000 (02:31 -0800)]
Merge "Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
Michael Jurka [Thu, 8 Nov 2012 08:32:29 +0000 (00:32 -0800)]
Enforce max number of 5 lockscreen widgets
Change-Id: I7b7fca18174736c8f1aa0018f7399982c80b1cb0
Jim Miller [Thu, 8 Nov 2012 09:20:55 +0000 (01:20 -0800)]
Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
Fixes bug
7499778
Change-Id: I450755b8839717f0f13241cb57f0015cf78569d9
Adam Cohen [Thu, 8 Nov 2012 09:03:49 +0000 (01:03 -0800)]
Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
Jim Miller [Thu, 8 Nov 2012 09:00:12 +0000 (01:00 -0800)]
Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
Jim Miller [Thu, 8 Nov 2012 05:23:32 +0000 (21:23 -0800)]
Don't show ECA in landscape mode on phones.
Fixes bug
7490941
Change-Id: I8a65aed0b4efc8676b95ad5fea6a7f4ac7d944d0
Jim Miller [Thu, 8 Nov 2012 08:51:25 +0000 (00:51 -0800)]
Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
Adam Cohen [Thu, 8 Nov 2012 08:25:47 +0000 (00:25 -0800)]
Adding user activity when the challenge is slid down
Change-Id: I54a7dcf79718090dac6ec5991185712cc2abca37
Jim Miller [Thu, 8 Nov 2012 08:04:29 +0000 (00:04 -0800)]
Add mechanism to kick keyguard to show the assistant
Fixes bug
7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
Adam Powell [Thu, 8 Nov 2012 08:28:58 +0000 (00:28 -0800)]
Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
Adam Powell [Thu, 8 Nov 2012 08:03:34 +0000 (00:03 -0800)]
Keyguard - force showing the status bar
Change-Id: I168293497a829346ba6f9566370c418ef1a09f8f
Chris Wren [Thu, 8 Nov 2012 00:18:46 +0000 (19:18 -0500)]
add bouncer frame to glowpad.
Bug:
7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
Jim Miller [Thu, 8 Nov 2012 06:40:20 +0000 (22:40 -0800)]
Disable interactive mode for full-screen security views in keyguard.
Change-Id: Ied038ba96ba3a6e6f6b4bd25a4c5be74814596fe
Adam Cohen [Thu, 8 Nov 2012 06:09:48 +0000 (22:09 -0800)]
Merge "Clean up some flashy jank (issue
7454766)" into jb-mr1-lockscreen-dev
Winson Chung [Thu, 8 Nov 2012 05:47:12 +0000 (21:47 -0800)]
Synchronizing bouncer duration with page scaling duration.
Change-Id: I9fba381582a083ce2ab26375698c5a6f3d554a1b
Adam Cohen [Thu, 8 Nov 2012 04:50:39 +0000 (20:50 -0800)]
Clean up some flashy jank (issue
7454766)
Change-Id: I809f3afbbb70e82847aa4851d20058a2c483a32e
Daniel Sandler [Thu, 8 Nov 2012 05:18:35 +0000 (21:18 -0800)]
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
Amith Yamasani [Thu, 8 Nov 2012 05:16:00 +0000 (21:16 -0800)]
am
3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '
3fe2cb4db60827889abd1f971910f807ae346488':
Don't cancel any notifications that are meant for all users, if no package is specified.