1903 Commits

Author SHA1 Message Date
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
Jeff Brown
c8018ebe7c Fix dream/keyguard infinite layout loop.
Bug: 7427191
Change-Id: If48d39cf890274607fd13cdd4d85c6c234ce5a2c
2012-10-30 18:40:54 -07:00
Adam Cohen
a371e5315e Merge "Fix content alpha" into jb-mr1-lockscreen-dev 2012-10-30 17:51:03 -07:00
Adam Cohen
ab8635d179 Fix content alpha
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
2012-10-30 17:40:43 -07:00
Danielle Millett
a0a230abf3 Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev 2012-10-30 17:33:55 -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
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
alanv
c7375afef7 Fix keypad accessibility.
Add lift-to-type to the PIN keypad. Speak entered PIN digits. Add content
descriptions to PIN keypad buttons.

Bug: 7436382
Change-Id: I7cb3977cc769598c5f783221e1257b13e5e108c7
2012-10-30 17:07:37 -07:00
Jim Miller
c8f7c5eb74 Merge "Fill in logic in WidgetPager to ignore music when reordering." into jb-mr1-lockscreen-dev 2012-10-30 16:57:53 -07:00
Jim Miller
bd0bf156c0 Merge "Implement correct music widget positioning in keyguard" into jb-mr1-lockscreen-dev 2012-10-30 16:55:12 -07:00
Dianne Hackborn
a56395da5d am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
* commit '7710199376657415e5341f64a830aa50fcb117aa':
  Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
2012-10-30 16:39:54 -07:00
Jim Miller
e0566da2da Fill in logic in WidgetPager to ignore music when reordering.
This moves music state management into KeyguardViewStateManager to allow
KeyguardWidgetPager access to it.

Fixes bug 7442977

Change-Id: I113b6d1c8848d60ae53b99e697b33e1e33d67853
2012-10-30 14:57:29 -07:00
Jim Miller
33384ed696 Merge "Attempt to fix bug on devices where multi-user support is disabled." into jb-mr1-lockscreen-dev 2012-10-30 14:25:12 -07:00
Jim Miller
26e6c2e442 Attempt to fix bug on devices where multi-user support is disabled.
Bug 7437751

Change-Id: Iff9f6a5a91fb9dd69b7176a5febb1d6e158d90b6
2012-10-30 14:21:41 -07:00
Jim Miller
bdca3c0a21 Implement correct music widget positioning in keyguard
This always inserts the music widget to the left of the camera
widget if it exists or as the right-most widget when music is
playing.

Fixes bug 7425361

Change-Id: Ida992fbdde254a2de0ab12c63e003ccfeab7a94a
2012-10-30 14:06:09 -07:00
Daniel Sandler
fba4d4a767 Show the keyboard less aggressively.
Bug: 7427586
Proto-Id: I154ac6faa7609da458157ecfba8d9a94f4e27ccb
Change-Id: I6fcabbdca358f124e362443db1377681378347ae
2012-10-30 16:35:40 -04:00
Winson Chung
ef653101d8 Merge "Moving persistence calls to background." into jb-mr1-lockscreen-dev 2012-10-30 12:28:18 -07:00
John Spurlock
b1e7695d7b Merge "Render camera widget correctly after shell restart." into jb-mr1-lockscreen-dev 2012-10-30 12:24:35 -07:00
Daniel Sandler
6249804ead Merge "Impose a height & width downward on challenge views." into jb-mr1-lockscreen-dev 2012-10-30 12:11:51 -07:00
Craig Mautner
ad09bccfe4 Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
Widgets that did not launch Activitys would not display the unlock
screens when they were tapped. Now any window that is shown with
FLAG_DISMISS_KEYGUARD set while the keyguard is locked will
cause the unlock screen to be displayed.

Bug: 7301530 fixed.
Change-Id: I90d11b52d2b63260bdb5f2b6eb7e98eb7a4d9331
2012-10-30 12:08:22 -07:00
John Spurlock
737798271e Render camera widget correctly after shell restart.
Bug: 7440304
Change-Id: I1ad8573cc843142d77436fd8361d7fc613b09f21
2012-10-30 15:08:21 -04:00
Winson Chung
f8f5966e59 Moving persistence calls to background.
Change-Id: Ief3b0862dfd24d520ec88afb5bbb9954ee90f2ac
2012-10-30 12:03:35 -07:00
Adam Cohen
4050da7d86 Merge "Addressing a couple comments on previous CL" into jb-mr1-lockscreen-dev 2012-10-30 11:22:56 -07:00
Adam Cohen
5be14ded67 Addressing a couple comments on previous CL
Change-Id: I6ee066a5e6c2dadff921bb2ed7e91ea2601eec05
2012-10-30 11:19:48 -07:00
Daniel Sandler
8a26bf5aea Impose a height & width downward on challenge views.
This means that challenges may no longer wrap_content, even
vertically. But it's the only way to rationalize across
different challenges, some of which want to be a fixed size,
some match_parent, and some wrap_content.

This change also fixes some problems with the password view
as well as PIN view (usable again on sw360 devices like
Galaxy Nexus).

Bug: 7427586
Change-Id: I648e68c5159fef7cf594d4bfe8f6d4bdd5da6b6a
Proto-Id: I280b4875a9deee5dfb7409bdfa8ed0b96fbd0cff
2012-10-30 13:59:07 -04:00
Winson Chung
70aa528b73 Fixing some regressions in tablet reordering/deleting.
Change-Id: Ib3e48fa2606c0259603f6daf3b2ef72e1c8e292d
2012-10-30 10:56:51 -07:00
John Spurlock
3114b1a09b Merge "Disable lockscreen window anim when launching camera." into jb-mr1-lockscreen-dev 2012-10-30 09:02:13 -07:00
John Spurlock
e2ac5207f2 Disable lockscreen window anim when launching camera.
Prevent the exit animation from running when exiting the lockscreen
due to launching the camera from the camera widget.

Bug:7429770
Change-Id: I2a0148d84158fca11dda4c4a563fe5ab3236be81
2012-10-30 11:53:50 -04:00
Chris Wren
16d83fd13a Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev 2012-10-30 08:21:02 -07:00
John Spurlock
cf69c56b83 "Fix camera widget scale-up regression." -> frameworks/base
lockhotness change-id: I69ccfa3a873943ab2e159d15937d5fb13f7acabd

Bug:7439300
Change-Id: I9e9eeae16b4e76d85a8145f3b198c22ad2e923e9
2012-10-30 09:21:16 -04:00
Adam Cohen
8a7785c7aa Cleaning up the way in which the challenge influences widget size on first measure pass
-> This change ensures that on first draw, the widget is the appropriate size if the
       security challenge is covering it.
    -> This change is in preparation for some new policy surrounding widget sizing --
       with this new policy, a given widget may need to be small even if the page is
       not being covered by the challenge. Hence, we propogate this small size to
       all the pages, whether or not they are covered. The pages will eventually
       use this.
    -> Ensure that paging hints are shown correctly (with the new sticky widget
       logic the page can be switched, and we weren't always seeing the appropriate
       hints).
    -> Also ensuring that the page is set correctly on first draw -- generally
       this change should make it so everything is right on the first draw.

Change-Id: I7e03be9b027aed0ebb0fada05652b4226fd23897
2012-10-29 22:52:15 -07:00
Danielle Millett
1108a2cb41 Added a makeInvisible call to Face Unlock
This makes it so that the view is hidden immediately when
a call to stop is made.  This also changes the call in onPause to
only stop and not go to the backup because we still want Face Unlock
to show as the view is being dragged down.

Change-Id: I66d8fc24e82dc3a0155f7d59d8ced932cb584660
2012-10-29 23:40:12 -04:00
Adam Powell
cfc3086b18 Keyguard polishing
Integrate from proto app

* New assets

* Layout changes

* Dragging behavior change for sliding challenge

* Realign camera for new padding

Change-Id: Ia177c60f59f1fc74000d95fc39b048321acf1246
2012-10-29 18:32:37 -07:00
Winson Chung
7bf93cf50f Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev 2012-10-29 17:53:28 -07:00
Winson Chung
9dc9923085 Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
- Fixing issue where you can long press a widget to reorder while the challenge is up

Change-Id: I6ef2fa050a5ebc35d1c3e373bb27519580ebe03d
2012-10-29 17:43:51 -07:00
John Spurlock
4b976ea1af "Implement grace period for camera widget." -> frame/base
Change-Id: If3159fa43d9de6188b262f3db76575c6436e138a
2012-10-29 18:48:15 -04:00
Chris Wren
32c557cea2 post user activity on widget pager moves
Change-Id: I3aa760090cb2036045045fc01d933cf35a9bbff9
Proto-Id: I9b98788dc108333657239b07ff36ce69892a3f96
2012-10-29 11:40:05 -04:00
Jim Miller
0b728244dc Update status area and emergency call logic to match new spec
Change-Id: Ic43d9d58168166aacf2b145663dc9412b099f9c2
2012-10-28 20:04:57 -07:00
Adam Cohen
e3643138c8 Implementing new slider / widget interaction where frame goes around the widget
-> Frame resizes dynamically as the security slides
-> Widget shrinks immediately as the handle begins being brought up
-> Widget grows only upon security settling in the down position
-> Cleaned up a lot of state interaction between the security slider
   and the widget pager / pages
-> Loosened long press slop (was using Euclidean distance by accident
   instead of x crossed or y crossed logic)

Change-Id: Ic52b62e577c539327b0a65c9277300fc626cf190
2012-10-28 18:44:54 -07:00
John Spurlock
b2f21c53cf Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev 2012-10-28 06:39:15 -07:00
Daniel Sandler
bc676a0a1d Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev 2012-10-27 21:44:07 -07:00
Daniel Sandler
c606bf1af9 Improved handle touch interaction.
- the handle size is now entirely independent of asset size
- the handle doesn't have to have a handle graphic
- the handle top/bottom sizing can each change based on
  whether the challenge is visible
- now, the handle becomes very small when the challenge is
  visible, and does not intrude into the challenge rect
  itself (so you really need to drag downward through the
  top edge of the challenge to activate the handle and close
  the challenge)
- when the challenge is closed, the handle may be clicked to
  open

Bug: 7428215
Change-Id: I4ca7b4d5d475337295a6a7492a831abbba288ac5
Proto-Id: Ibc8997ece27ca1e0fa4deb651bb11860f95d7b23
2012-10-28 00:12:21 -04:00
Adam Cohen
47c6cfaa37 Ensuring layers are enabled on screen on and that pages are correctly transformed
Change-Id: Ifeeb9baeb3cde58d034d9988565bc2ce07c3c23a
2012-10-27 18:40:38 -07:00
Adam Cohen
f9048cd09b Polish to 3d carousel and standard pager
-> updated assets
-> Always showing outlines as per new mock
-> Enabling layers on content during fades (still need to sort out layers for frames)
-> Added carousel overscroll as per discussion with danship
-> Fading side pages in carousel
-> other small polish

Change-Id: If88686768c621a65b175a74c07cb55a69321fd97
2012-10-27 16:36:44 -07:00