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

1830 Commits

Author SHA1 Message Date
Jim Miller
873d6e911c am 99e8692a: am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev 
* commit '99e8692ace643f2e6a41530dc05411f707e0394b':
  Fix potential null pointer exeption in keyguard
 2012-10-31 19:45:15 -07:00
Jim Miller
c3ab855a35 am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev 
* commit 'e0ec5d428f80fe49b291a0e0edd51a4398bde609':
  Fix potential null pointer exeption in keyguard
 2012-10-31 18:37:55 -07:00
Jeff Brown
6f0888864a am 5c43c889: am 427279fb: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 
* commit '5c43c88945945fbf833b05d2ed851d5e43bef4b5':
  Fix dream/keyguard infinite layout loop.
 2012-10-31 16:50:49 -07:00
Jeff Brown
c1c53e56fb Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 2012-10-31 16:42:26 -07:00
Dave Burke
39a8790574 am 026c6254: am ee6e3354: am 86e1b966: Fix ordering bug 
* commit '026c6254d71bba9924eca0ae07230f3b6005758b':
  Fix ordering bug
 2012-10-30 21:56:13 -07:00
Dave Burke
86e1b96666 Fix ordering bug 
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
 2012-10-30 21:45:12 -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
Ed Heyl
b7df8c9630 am ec71d5d8: am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev 
* commit 'ec71d5d8e2e4ff5eb2ca0bd765326806c19e698a':
  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:13:05 -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
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
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
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
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
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
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