Baligh Uddin
02dfd644c9
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-31 10:13:00 -07:00
Baligh Uddin
8339bf19ec
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-31 10:11:17 -07:00
Dave Burke
1b33342b00
am 86e1b966: Fix ordering bug
...
* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
Fix ordering bug
2012-10-30 21:51:11 -07:00
Dave Burke
ee6e335448
am 86e1b966: Fix ordering bug
...
* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
Fix ordering bug
2012-10-30 21:51:08 -07:00
Dave Burke
86e1b96666
Fix ordering bug
...
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:45:12 -07:00
Adam Powell
e74fcc0eb1
Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
2012-10-30 21:00:40 -07:00
Adam Powell
cdf8b48745
Fix keyguard bugs
...
Integrate from proto app
Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.
Fix bug 7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.
Use layers when moving the security view around.
Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
2012-10-30 20:57:10 -07:00
Michael Jurka
3c416dfcc0
Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
2012-10-30 20:55:49 -07:00
Michael Jurka
536f067c34
Fix crash on boot
2012-10-30 20:50:21 -07:00
Jim Miller
162fc8e64b
Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
2012-10-30 20:43:52 -07:00
Jim Miller
22ae05d50c
Re-enable transition animation between face unlock and backup
...
Change-Id: Ia90cf73e400f45c8b73f34cbc521dcbc62258ca8
2012-10-30 20:37:57 -07:00
Jim Miller
e0ec5d428f
Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
2012-10-30 20:18:10 -07:00
Jim Miller
82b517be0b
Fix potential null pointer exeption in keyguard
...
The code was adding default widgets before setting mViewStateManager, which means the
callback from the transport control might access mViewStateManager before it's set.
Change-Id: I985a3c8062d0660519cb4a4c8c1b42c7c90f4ac7
2012-10-30 20:12:53 -07:00
Baligh Uddin
ad0ceadf27
Import translations. DO NOT MERGE
...
Change-Id: I93ab875ed71833efc99917a6474f1401fb47c263
Auto-generated-cl: translation import
2012-10-30 19:35:18 -07:00
Baligh Uddin
7fc99e8911
Import translations. DO NOT MERGE
...
Change-Id: I01d1dafe9b0dc9d6fb4d90ff97fc39cbeca4f3f8
Auto-generated-cl: translation import
2012-10-30 19:34:07 -07:00
Baligh Uddin
d66c41c56b
Import translations. DO NOT MERGE
...
Change-Id: I6df01942373d95ef42198afb69cf892fbdbec798
Auto-generated-cl: translation import
2012-10-30 19:32:59 -07:00
Baligh Uddin
30a3eeaa4b
Import translations. DO NOT MERGE
...
Change-Id: I0909dffc40bf6e8325b97aa0c5a0ccc07830b330
Auto-generated-cl: translation import
2012-10-30 19:13:28 -07:00
Baligh Uddin
a7cd483e4d
Import translations. DO NOT MERGE
...
Change-Id: I359781293df3f79daa98691719636baac0f93afb
Auto-generated-cl: translation import
2012-10-30 19:10:48 -07:00
Baligh Uddin
9ab7f479f9
Import translations. DO NOT MERGE
...
Change-Id: I5a6cc89a0cdc7d6fa5be47c926e69555db4e9ba9
Auto-generated-cl: translation import
2012-10-30 19:08:26 -07:00
Jeff Brown
c8018ebe7c
Fix dream/keyguard infinite layout loop.
...
Bug: 7427191
Change-Id: If48d39cf890274607fd13cdd4d85c6c234ce5a2c
2012-10-30 18:40:54 -07:00
Svetoslav Ganov
8ea7cbe6f3
Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
2012-10-30 18:40:51 -07:00
Svetoslav Ganov
0b6e2a45d8
Lockscreen accessibility - strings.
...
Change-Id: Ic38c2d3e3052979f4f1569e851f365c10d8c93f0
2012-10-30 18:39:16 -07:00
Svetoslav Ganov
4a85b9f36c
am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
Fixing view accessibility classification for recents.
2012-10-30 18:34:15 -07:00
Svetoslav Ganov
1728e5509e
am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
Fixing view accessibility classification for recents.
2012-10-30 18:33:29 -07:00
Svetoslav Ganov
0bd6f96ff0
Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
2012-10-30 18:30:45 -07:00
Ed Heyl
31dfff783e
am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
...
* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':
Fix content alpha
Removed makeInvisible() function
Making the reordering play nice with the 3D widget carousel
Fixed misplacement of cancel(X) button for Face Unlock
Fill in logic in WidgetPager to ignore music when reordering.
Attempt to fix bug on devices where multi-user support is disabled.
Implement correct music widget positioning in keyguard
Render camera widget correctly after shell restart.
Moving persistence calls to background.
FUL uses square aspect ratio for all layouts fixes b/7426399
Addressing a couple comments on previous CL
Impose a height & width downward on challenge views.
Fixing some regressions in tablet reordering/deleting.
Disable lockscreen window anim when launching camera.
2012-10-30 18:07:43 -07:00
Ed Heyl
1f928787ee
am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
...
* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':
2012-10-30 18:07:39 -07:00
Amith Yamasani
d2f616f224
am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
...
* commit '20329dcb37fffca1de3ded6b58341e87cc43c4a9':
QS uses nickname for multiuser and profile name for singleuser.
2012-10-30 18:07:39 -07:00
Ed Heyl
5c12bc5851
Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev
2012-10-30 18:04:31 -07:00
Amith Yamasani
7277d5d97f
QS uses nickname for multiuser and profile name for singleuser.
...
Bug: 7400662
Change-Id: I3299ee70acaa7341ec11b4774426e22182ffd170
2012-10-30 17:53:14 -07:00
Amith Yamasani
146378e7c2
am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
...
* commit '20329dcb37fffca1de3ded6b58341e87cc43c4a9':
QS uses nickname for multiuser and profile name for singleuser.
2012-10-30 17:51:30 -07:00
Adam Cohen
a371e5315e
Merge "Fix content alpha" into jb-mr1-lockscreen-dev
2012-10-30 17:51:03 -07:00
Amith Yamasani
20329dcb37
Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
2012-10-30 17:47:58 -07:00
Chet Haase
63f80350dc
am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
...
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
WindowManager shouldn't layout non-visible windows
2012-10-30 17:45:57 -07:00
Chet Haase
2e6a65ca8f
am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
...
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
WindowManager shouldn't layout non-visible windows
2012-10-30 17:45:55 -07:00
Amith Yamasani
77007ac6a4
am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev
...
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
Don't clean up wallpaper map entry when stopping a user.
2012-10-30 17:44:05 -07:00
Amith Yamasani
e3d8774d30
am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev
...
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
Don't clean up wallpaper map entry when stopping a user.
2012-10-30 17:44:04 -07:00
Chet Haase
27f752eb1d
Merge "WindowManager shouldn't layout non-visible windows" into jb-mr1-dev
2012-10-30 17:42:43 -07:00
Adam Cohen
ab8635d179
Fix content alpha
...
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
2012-10-30 17:40:43 -07:00
Amith Yamasani
a07d047f34
Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev
2012-10-30 17:40:13 -07:00
Danielle Millett
a0a230abf3
Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev
2012-10-30 17:33:55 -07:00
Brian Colonna
d76b320b73
Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev
2012-10-30 17:32:36 -07:00
Danielle Millett
54d181db0e
Removed makeInvisible() function
...
This is now being done inside stopUI instead of its own separate
call since it needs to be done on the UI thread inside FaceLockService.
Change-Id: Iaf3a203f7f201ba4dde4c878f457e765f11e6c0e
2012-10-30 20:18:44 -04:00
Adam Cohen
7ff5535895
Merge "Making the reordering play nice with the 3D widget carousel" into jb-mr1-lockscreen-dev
2012-10-30 17:11:02 -07:00
Dirk Dougherty
81f0583340
am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
...
* commit '0572827720e191b3e6fe4466ae09058f5d578c57':
Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:10:19 -07:00
Dirk Dougherty
0a12d86d47
am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
...
* commit '0572827720e191b3e6fe4466ae09058f5d578c57':
Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:10:19 -07:00
Casey Burkhardt
c7c972d832
Fixing view accessibility classification for recents.
...
Change-Id: I0324fe322d97ee35105d7d71442fa79663e0fdfa
Bug: 7438790
2012-10-30 17:09:28 -07:00
Adam Cohen
70009e426a
Making the reordering play nice with the 3D widget carousel
...
-> Ensuring that transforms, hidden side pages, alphas all transition
and fade seamlessly to and from the carousel
Change-Id: I6197f17899135a9e551ff1691c63ad5a2bb1d0f7
2012-10-30 17:08:59 -07:00
Dirk Dougherty
0572827720
am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
...
* commit 'c6df397effaf5417c8adcd72704cf7ceba59adfb':
Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:07:02 -07:00
Dirk Dougherty
c6df397eff
am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
...
* commit 'a76f1dfc7740fa506c8ba4058e2ad8b90b476fe8':
Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:04:48 -07:00