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 |
|
Daniel Sandler
|
25c0e69287
|
am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
* commit 'c57f0d3e540f916f629d160148231bb38d3deb64':
Haptics for PIN enter key
|
2012-10-29 13:30:48 -07:00 |
|
Daniel Sandler
|
b6890d3412
|
am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
* commit '40d98edb43e3e897b1db4ac9f47bb522f585d3a5':
Haptics for PIN keys.
|
2012-10-29 13:30:45 -07:00 |
|
Daniel Sandler
|
165303f645
|
am d5692742: PIN pad cosmetics.
* commit 'd5692742c1ff056e9fe55a495632229c86ed5384':
PIN pad cosmetics.
|
2012-10-29 13:30:36 -07:00 |
|
Daniel Sandler
|
51b0919d30
|
am 2c1ce056: Cleaning up password input.
* commit '2c1ce0564fbd329e9e9ccfca100c69cfc1fd2645':
Cleaning up password input.
|
2012-10-29 13:30:32 -07:00 |
|
Jim Miller
|
cc5abfd4d6
|
am df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
* commit 'df99b1d5d34c69f1a2e4490dadae5e69a0dd5a72':
Fix new password view in keyguard
|
2012-10-29 13:30:24 -07:00 |
|
Michael Jurka
|
e88eebbb3b
|
am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit '147dfc8642ecbdce527d18bdbeece7b7d05dc883':
Adding ability to add multiple widgets to keyguard
|
2012-10-29 13:30:16 -07:00 |
|
Adam Powell
|
662bf7b23e
|
am eee20931: Beginnings of bouncer support; add scrims and state tracking
* commit 'eee209313d564be37b8fc068f785b3844cd6597e':
Beginnings of bouncer support; add scrims and state tracking
|
2012-10-29 13:30:00 -07:00 |
|
Adam Powell
|
82da5b173c
|
am c0657fb3: Integrate changes from lockscreen proto app
* commit 'c0657fb36ce5ede652e8af084e484d07abfb449d':
Integrate changes from lockscreen proto app
|
2012-10-29 13:29:43 -07:00 |
|
Chris Wren
|
aa461dbdd7
|
am bdaab675: am 0d3215c2: am f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev
* commit 'bdaab6750b040810ca26ddac59a9f2ce72615a23':
remove debug logs.
|
2012-10-29 12:53:51 -07:00 |
|
Adam Cohen
|
1a77671114
|
am 6f02456e: am f2344e08: am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev
* commit '6f02456e75e1aa1cc4cac593c3060a46761f0f31':
Fading side pages as per mock
|
2012-10-29 12:53:44 -07:00 |
|
Chris Wren
|
46566b30b6
|
am afa8b7ba: am a90f82fc: am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev
* commit 'afa8b7ba41c131d1862d1a24a08c9ffcd162a47f':
catch exceptional cases on factory-fresh devices.
|
2012-10-29 12:53:40 -07:00 |
|
John Spurlock
|
9e1f1a8e84
|
am 8a109dba: am 8c480e4b: am 86b6357e: Manual f/b merge of lockhotness camera integration.
* commit '8a109dba86857853b3351b3a7f41150629b494ad':
Manual f/b merge of lockhotness camera integration.
|
2012-10-29 12:52:42 -07:00 |
|
Jim Miller
|
aa557e5c25
|
am 0e0d6fba: am 412b6a5e: am 19a52670: Merge latest prototype changes into keyguard
* commit '0e0d6fbab4d1f3e19718f251baab9f2da13e57d4':
Merge latest prototype changes into keyguard
|
2012-10-29 12:52:35 -07:00 |
|
Danielle Millett
|
7898fda7f4
|
am 1c41939d: am 5cba537a: am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
* commit '1c41939d8a1bb92d06d63d7c937d77539b61e290':
Handling popups correctly for face unlock
|
2012-10-29 12:52:11 -07:00 |
|
Chris Wren
|
0d3215c24c
|
am f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev
* commit 'f0cec427a4f73bda130eda98c2a7f70e44ff587b':
remove debug logs.
|
2012-10-29 12:46:24 -07:00 |
|
Adam Cohen
|
f2344e087c
|
am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev
* commit 'a9f166695b92e91ea6bb13a41f3aa1fb3f6ee77c':
Fading side pages as per mock
|
2012-10-29 12:46:16 -07:00 |
|
Chris Wren
|
a90f82fc10
|
am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev
* commit 'ff8722574ee335453845c3dc04435a20dc94a99b':
catch exceptional cases on factory-fresh devices.
|
2012-10-29 12:46:13 -07:00 |
|
John Spurlock
|
8c480e4b1f
|
am 86b6357e: Manual f/b merge of lockhotness camera integration.
* commit '86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
Manual f/b merge of lockhotness camera integration.
|
2012-10-29 12:45:17 -07:00 |
|
Jim Miller
|
412b6a5ef2
|
am 19a52670: Merge latest prototype changes into keyguard
* commit '19a5267003e7dc70100a4bd4f1f449523b2ff38b':
Merge latest prototype changes into keyguard
|
2012-10-29 12:45:09 -07:00 |
|
Danielle Millett
|
5cba537ae1
|
am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
* commit '7c420ec69843c8efc95b4f36aa77f17d970d4eaf':
Handling popups correctly for face unlock
|
2012-10-29 12:44:46 -07:00 |
|
Jason Simmons
|
d45f2ae845
|
am e49b9c05: am df304ba0: resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev
* commit 'e49b9c05c3774ab9409701788d4e00ced6292a4a':
Integrate new PIN pad.
|
2012-10-29 12:26:18 -07:00 |
|
Jason Simmons
|
df304ba0ba
|
resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev
Change-Id: Ic6d9435cf6c86a8048a99488d2e1dab49b4454c6
|
2012-10-29 11:24:11 -07:00 |
|
Chris Wren
|
e5289a1120
|
am c5bb27d2: am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
* commit 'c5bb27d246cdc2b66b20cf11e5521e6c1d1f7ac5':
merge new multiuser avatars in from proto app
|
2012-10-29 09:34:03 -07:00 |
|