Dianne Hackborn
3b8ee1686b
am 7913a867: am 5b285941: am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
...
* commit '7913a867a1edf65b438f111ef4becb4a0c597600':
Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
2012-10-30 16:45:07 -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
Chris Wren
d94190d1b5
am be11ad40: am a014c7a0: am 16d83fd1: Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev
...
* commit 'be11ad40d2a197ddd692e6776ea3a6fa3b81d9af':
post user activity on widget pager moves
2012-10-30 10:15:35 -07:00
John Spurlock
22b048a5b4
am 4ea2b92f: am 7d14e57c: am cf69c56b: "Fix camera widget scale-up regression." -> frameworks/base
...
* commit '4ea2b92fd92c6735e5e211695a0605632a49da6e':
"Fix camera widget scale-up regression." -> frameworks/base
2012-10-30 10:15:31 -07:00
Adam Cohen
09b9afb0a2
am 217a6b89: am eec804e3: am 8a7785c7: Cleaning up the way in which the challenge influences widget size on first measure pass
...
* commit '217a6b8947694d7c7e886e2cc22b476adbb75b4e':
Cleaning up the way in which the challenge influences widget size on first measure pass
2012-10-30 10:15:23 -07:00
Danielle Millett
287f39c2e5
am 9540ab3d: am e9846105: am 1108a2cb: Added a makeInvisible call to Face Unlock
...
* commit '9540ab3d71746f01c239aa275ba77c0c9367e979':
Added a makeInvisible call to Face Unlock
2012-10-30 10:15:19 -07:00
Adam Powell
afa6b45a39
am eff3fe06: am 2d22c9d7: am cfc3086b: Keyguard polishing
...
* commit 'eff3fe06ecf605a4c61c3082ce8e3cce6e3ccf67':
Keyguard polishing
2012-10-30 10:15:16 -07:00
Winson Chung
ad01f5fefe
am 9fbbc5e4: am 49d42b93: am 7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
...
* commit '9fbbc5e45350f19bd9766a86ad792071abb36f09':
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
2012-10-30 10:15:12 -07:00
John Spurlock
9f3041d753
am 70967109: am c6b4cfa7: am d9910249: Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
...
* commit '7096710936ae4ab36489ac7edddfb140d782ef92':
"Implement grace period for camera widget." -> frame/base
2012-10-30 10:15:01 -07:00
Jim Miller
e110bac77b
am ced46451: am f4642bc8: am 0b728244: Update status area and emergency call logic to match new spec
...
* commit 'ced46451736d11d558c1771270dc56f886e2c377':
Update status area and emergency call logic to match new spec
2012-10-30 10:14:14 -07:00
Adam Cohen
17ead72e85
am b829b57f: am c5c0028c: am e3643138: Implementing new slider / widget interaction where frame goes around the widget
...
* commit 'b829b57f7401f5565b017755660fd6f1e4978815':
Implementing new slider / widget interaction where frame goes around the widget
2012-10-30 10:14:08 -07:00
John Spurlock
bdbb07bf7a
am bb7faa1f: am 0cb115f6: am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
...
* commit 'bb7faa1f450b9664207047b01fd040ee23d77414':
Use settings to persist sticky widget.
2012-10-30 10:13:35 -07:00
Daniel Sandler
95db72d613
am ee12c306: am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
...
* commit 'ee12c3063dd5760ab2c6d7cf979bc3d9f986ba5e':
Improved handle touch interaction.
2012-10-30 10:13:31 -07:00
Adam Cohen
9c75418d57
am 10f082c6: am 9633ea97: am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed
...
* commit '10f082c6cac6e192a42c20d596d2c383a6ee930f':
Ensuring layers are enabled on screen on and that pages are correctly transformed
2012-10-30 10:13:23 -07:00
Adam Cohen
6b3016257d
am c19401a7: am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
...
* commit 'c19401a793869e9569b72f2c4c3fae9db9254c44':
Polish to 3d carousel and standard pager
2012-10-30 10:13:18 -07: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
Adam Powell
cc32e70aeb
am f464bee4: am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout
...
* commit 'f464bee41fa73e7d798bcec7274c20afa032e1bb':
Fix measurement bug in keyguard/MultiPaneChallengeLayout
2012-10-29 17:14:41 -07:00
Adam Powell
0e3a9e4f69
am c4f06ec4: am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev
...
* commit 'c4f06ec48f2bfe2abf415eff01a236aed59e3706':
Keyguard - prevent slider intercept when we don't want it
2012-10-29 17:14:38 -07:00
Winson Chung
64593c9544
am e8e627db: am 69d0686f: am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
...
* commit 'e8e627dbdf0cce3528df1b239a7b215d65e63923':
Making the PagedView full screen on tablets.
2012-10-29 17:14:34 -07:00
Adam Cohen
ae40fe2ab1
am 14bc0bd5: am 40011d6f: am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
...
* commit '14bc0bd5bef1e92ecb57435133bb3b4b3db3fa10':
3D carousel initial stab -- paging outlines / alpha effects pending design
2012-10-29 17:14:26 -07:00
Adam Powell
f20af07ad0
am 54e94487: am a5b74cc4: am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
...
* commit '54e94487c7eddbac1db1717a2faf4dfebd6da072':
Fix lockscreen slider bugs
2012-10-29 17:14:02 -07:00
John Spurlock
eda411dae5
am 46d9322f: am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
...
* commit '46d9322fc747990f73155f8635c595dc7ce916ac':
Implement "sticky" widget logic.
2012-10-29 17:13:56 -07:00
Daniel Sandler
ac424701d4
am 06c43b43: am cc3e894a: am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev
...
* commit '06c43b430e9c97c6abe379dacfad298e5285f2f9':
Remove the handle headroom if the challenge is open.
2012-10-29 17:13:48 -07:00
Daniel Sandler
7da7d8750c
am f684beb8: am a84d353c: am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev
...
* commit 'f684beb8ea0603eb53c33f9cf5fecb664b0eb27c':
Expand top of touchable area of challenge drag handle.
2012-10-29 17:13:44 -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
fb614e4002
am 3f47cd2b: am 592f6343: am f0fd172a: lock out clicks while switching.
...
* commit '3f47cd2bf541435468f0e8af53767d7c14fbb2f6':
lock out clicks while switching.
2012-10-29 13:43:06 -07:00
John Spurlock
fd7b509ab9
am aa9aa440: am ee12f5aa: am 47cde77b: Fix camera bugs found overnight.
...
* commit 'aa9aa440cbe1526ffeafc1326b7a4d00e3b5f3d7':
Fix camera bugs found overnight.
2012-10-29 13:42:58 -07:00
Adam Powell
215368103a
am e7c8c76d: am 300772e6: am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider
...
* commit 'e7c8c76d4ae870c020d54925066323953ac88127':
Integrate assets from UX; drag/bouncer animation behavior in slider
2012-10-29 13:42:54 -07:00
Jim Miller
06d76dcfdf
am 2d1c6770: am 3dd3a41a: am 9b1db682: Fix issue where security view sometimes doesn\'t show.
...
* commit '2d1c6770e542891098f7678477558adcb06f1198':
Fix issue where security view sometimes doesn't show.
2012-10-29 13:42:48 -07:00
Jim Miller
4ad329ce34
am ebda6cb0: am c8896dab: am a71984f3: Cleanup keyguard signals
...
* commit 'ebda6cb064a179893446889272ca5fd9d9c98097':
Cleanup keyguard signals
2012-10-29 13:42:44 -07:00
Michael Jurka
ff9c65a2f1
am 6dd6d43a: am b1c5ec17: am 1254f2f4: Persist reordering/deleting widgets on keyguard
...
* commit '6dd6d43a8bf25ce5abe58f86c0ddae430ab96c4f':
Persist reordering/deleting widgets on keyguard
2012-10-29 13:42:40 -07:00
Jim Miller
f04139d1f3
am 42321210: am 33e62a80: am f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
...
* commit '42321210d0867db4e227a9b749e4a1f604d358f7':
Route signals from SlidingChalleng to SecurityView
2012-10-29 13:42:33 -07:00
Adam Powell
ab9c9264ea
am 79cec380: am 0d980a3b: am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
...
* commit '79cec380a30412e957cb7ba9cc9f04fcacf5d9f0':
Keyguard bouncer notifications; focus moving and the bouncer; slops
2012-10-29 13:42:25 -07:00
John Spurlock
1409076261
am cdf6c25d: am eb4c0cb5: am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
...
* commit 'cdf6c25d6254b0375d78f22c40fc16b85c84de19':
Manual frameworks/base merge from lockhotness (camera).
2012-10-29 13:42:09 -07:00
Daniel Sandler
0e80e7560b
am 9c578ae9: am 25c0e692: am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
...
* commit '9c578ae93f1867447bcb3f0bffe2deab330c094d':
Haptics for PIN enter key
2012-10-29 13:42:01 -07:00
Daniel Sandler
4f2b5f10cf
am 7a77f1f3: am b6890d34: am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
...
* commit '7a77f1f3a5c83a29d50391ea39a3cd2e47449662':
Haptics for PIN keys.
2012-10-29 13:41:57 -07:00
Daniel Sandler
43de88e40f
am 0608c843: am 165303f6: am d5692742: PIN pad cosmetics.
...
* commit '0608c84310fef390370a691e35cf6034e666d852':
PIN pad cosmetics.
2012-10-29 13:41:05 -07:00
Daniel Sandler
aec058e6a0
am 67df65a4: am 51b0919d: am 2c1ce056: Cleaning up password input.
...
* commit '67df65a4978edf9e01917d9cf20cb38ed1b785d8':
Cleaning up password input.
2012-10-29 13:40:47 -07:00
Jim Miller
20df39fee5
am 42b07572: am cc5abfd4: am df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
...
* commit '42b07572411bb7dd656744b4ead7cfb65bc87e32':
Fix new password view in keyguard
2012-10-29 13:40:39 -07:00
Michael Jurka
e3e8928ff9
am 56dfba03: am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
...
* commit '56dfba037cbfec51df16e324dd4b0daa8b540746':
Adding ability to add multiple widgets to keyguard
2012-10-29 13:40:31 -07:00
Adam Powell
fe6823e257
am aacd795b: am 662bf7b2: am eee20931: Beginnings of bouncer support; add scrims and state tracking
...
* commit 'aacd795b18f5f9886747c29020c6f59ea7ef3c89':
Beginnings of bouncer support; add scrims and state tracking
2012-10-29 13:40:10 -07:00
Adam Powell
aa2800b286
am 76fe94c0: am 82da5b17: am c0657fb3: Integrate changes from lockscreen proto app
...
* commit '76fe94c067b68347ada44f14aec713411e4b2753':
Integrate changes from lockscreen proto app
2012-10-29 13:39:58 -07:00
Adam Powell
0d980a3b29
am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops
...
* commit '0b1b552268bc6641cc5d01fb80c12258da9c6985':
Keyguard bouncer notifications; focus moving and the bouncer; slops
2012-10-29 13:31:12 -07:00
John Spurlock
eb4c0cb509
am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
...
* commit '2e8a98e269486700d985f842806ce70e3a394dc9':
Manual frameworks/base merge from lockhotness (camera).
2012-10-29 13:30:56 -07:00