drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,044 Commits 1 Branch 0 Tags
Commit Graph

1950 Commits

Author SHA1 Message Date
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
Jim Miller
f6faa5312e am 7c7bf36e: am 8615a071: am 022554e3: Merge latest prototype changes into keyguard 
* commit '7c7bf36e48a73727f4ac255f908f78bcfea04507':
  Merge latest prototype changes into keyguard
 2012-10-29 09:26:47 -07:00
Jim Miller
3fd568999b am c5848971: am 17ac77c7: am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c584897164c79e5949f41377be9adeede0f36668':
  Wire up "add widget" in keyguard
 2012-10-29 09:26:43 -07:00
Jim Miller
e442b2bcdb am 1539a3d6: am ec141cd3: am 08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView. 
* commit '1539a3d67a901616ac5be5881da9f7fcb5cd2e3a':
  Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
 2012-10-29 09:26:28 -07:00
Chris Wren
0882fe87d4 am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit '3867ddabbe645749ba3d7db9fc0c0ab9ca84690b':
  merge new multiuser avatars in from proto app
 2012-10-29 09:25:16 -07:00
Jim Miller
8615a071c4 am 022554e3: Merge latest prototype changes into keyguard 
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
  Merge latest prototype changes into keyguard
 2012-10-29 09:16:41 -07:00
Jim Miller
17ac77c767 am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
  Wire up "add widget" in keyguard
 2012-10-29 09:16:37 -07:00
Jim Miller
ec141cd382 am 08697709: Fix multiple onScreenTurnedOn callbacks in KeyguardHostView. 
* commit '086977094d96ab9352432e0941a05b09cefc92ac':
  Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
 2012-10-29 09:16:26 -07: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
John Spurlock
5f050e5c2c Use settings to persist sticky widget. 
Addressing some comments:
 - Sticky widget is now saved in a user-scoped setting.
 - Removed multi-user widget from computation (obsolete).
 - Removed status widget from computation (just use right-most).
 - Removed duplicate isMusicPlaying logic.

(frameworks/base)

Change-Id: I8ef8f826677d78ac24da52adf2d99d47c8d965ac
 2012-10-27 10:55:09 -04:00
Jim Miller
e14833c8e7 am 0f261b7e: am 52c55cd0: am d6523da1: Merge latest prototype changes into the framework 
* commit '0f261b7ea81efe85d64059826cdaeee6a585aeed':
  Merge latest prototype changes into the framework
 2012-10-26 18:20:03 -07:00
Jim Miller
325a0a0cf4 am bd5c198d: am 13056c98: am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 
* commit 'bd5c198dd5e73c22447636b7faaf8951585b2d12':
  Get basic keyguard working in new branch
 2012-10-26 18:19:52 -07:00
Adam Powell
0a27c4865e Fix measurement bug in keyguard/MultiPaneChallengeLayout 
Change-Id: Ifbcd32281f06e6c53e573998e7085d7d0542acac
 2012-10-26 17:13:19 -07:00
Adam Powell
b0ed8bdb41 Merge "Keyguard - prevent slider intercept when we don't want it" into jb-mr1-lockscreen-dev 2012-10-26 16:26:20 -07:00
Winson Chung
113ca64a22 Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev 2012-10-26 16:24:02 -07:00
Adam Powell
995270f011 Keyguard - prevent slider intercept when we don't want it 
Integrate from proto app

When calling code deliberately hides the slider, block drags of the
slider that may begin shortly after. This prevents the case where edge
dragging a widget can accidentally catch the slider instead.

Change-Id: I7e8e1ad4afbea0abeeb08161ddeb938c858fc4a5
 2012-10-26 16:13:22 -07:00
Adam Cohen
9ec871def3 3D carousel initial stab -- paging outlines / alpha effects pending design 
Change-Id: I2d9851472472a0affa9b46b2508fc7a1cb8c9779
 2012-10-26 16:10:51 -07:00