36319 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ab5202c3f1 Fix build - Add back symbol that's still needed
Change-Id: Iee59db7950bd83a480baa0b63729b16563251ad9
2012-10-31 11:35:48 -07:00
Ed Heyl
ec71d5d8e2 am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit '31dfff783eeb9ac856bc2fbfa14e7af5190fd717':
  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:10:09 -07:00
Ed Heyl
31dfff783e am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':
  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:07:43 -07:00
Danielle Millett
a0a230abf3 Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev 2012-10-30 17:33:55 -07:00
Brian Colonna
d76b320b73 Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev 2012-10-30 17:32:36 -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
Brian Colonna
ddbf138d11 Fixed misplacement of cancel(X) button for Face Unlock
Before the FUL service started, the FUL cancel button was positioned
off of the right side of the window.  This was because the
FaceUnlockView (derived from RelativeLayout) was calling
super.onMeasure() incorrectly, preventing it from using the new
'square' size when laying out child views.

Change-Id: I2f1e86617da5c8f37123febab2e433288bdea062
2012-10-30 18:34:39 -04:00
Brian Colonna
0ca9723327 Merge "FUL uses square aspect ratio for all layouts fixes b/7426399" into jb-mr1-lockscreen-dev 2012-10-30 13:41:52 -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
Brian Colonna
68d257d788 FUL uses square aspect ratio for all layouts fixes b/7426399
When the referenced bug was filed, face unlock was only showing as a
tiny sliver on tablet layouts.  Due to other changes in the lockscreen
branch, it was no longer a sliver, but was still an incorrect layout,
with a width much greater than height.  This change makes face unlock
square for all layouts.

The face unlock RelativeLayout was replaced with a custom
FaceUnlockView derived from RelativeLayout.  The new view forces a
square layout using the same technique used by LockPatternView.

Note that there is still a bug where the pattern view covers the widget
area on portrait tablet layouts.  The face unlock view has this same
issue, but may resolve itself when the pattern bug is fixed.

Also note there are two other Face Unlock tablet bugs that existed
before this change (and therefore are not caused by this change):
 - flash during transition from spotlight animation to camera preview
 - PIN backup is upper-left instead of centered

Change-Id: I550eccfa3924f230a9dc43f0a9b59f1ea55a9273
2012-10-30 14:48:55 -04: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
Dianne Hackborn
441fcb3cab am ef3aab13: am 44251a70: Merge "Work on issue #7343200: Fails to show wallpaper in the background..." into jb-mr1-dev
* commit 'ef3aab130c95fbfb03e056ffdb7819b485c06398':
  Work on issue #7343200: Fails to show wallpaper in the background...
2012-10-30 10:52:22 -07:00
Dianne Hackborn
ef3aab130c am 44251a70: Merge "Work on issue #7343200: Fails to show wallpaper in the background..." into jb-mr1-dev
* commit '44251a70edba3e950aab1f706e1ff34e2fa4dfae':
  Work on issue #7343200: Fails to show wallpaper in the background...
2012-10-30 10:49:21 -07:00
Dianne Hackborn
44251a70ed Merge "Work on issue #7343200: Fails to show wallpaper in the background..." into jb-mr1-dev 2012-10-30 10:45:49 -07:00
Amith Yamasani
1b9d765628 am 2618797c: am 13a6df91: Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
* commit '2618797c206fb18484f4023f243d8385d9075a3f':
  Only send broadcasts to registered receivers
2012-10-30 10:04:43 -07:00
Amith Yamasani
2618797c20 am 13a6df91: Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
* commit '13a6df91d9016063057aed07d21c8135f22f7f18':
  Only send broadcasts to registered receivers
2012-10-30 10:02:36 -07:00
Amith Yamasani
13a6df91d9 Merge "Only send broadcasts to registered receivers" into jb-mr1-dev 2012-10-30 10:00:04 -07:00
Svetoslav Ganov
5aaaa76ed7 am 8f1aaa14: am 567fa759: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
* commit '8f1aaa147df64f86c95ed4598b34af7a72767cbe':
  Lockscreen accessibility - strings.
2012-10-30 09:24:30 -07:00
Danielle Millett
9540ab3d71 am e9846105: am 1108a2cb: Added a makeInvisible call to Face Unlock
* commit 'e98461056713f0bb483abf017e68a96088193c29':
  Added a makeInvisible call to Face Unlock
2012-10-30 09:24:15 -07:00
Adam Powell
eff3fe06ec am 2d22c9d7: am cfc3086b: Keyguard polishing
* commit '2d22c9d72038f8fc491c39bb964c5fbee15e0c7d':
  Keyguard polishing
2012-10-30 09:24:12 -07:00
Jim Miller
ced4645173 am f4642bc8: am 0b728244: Update status area and emergency call logic to match new spec
* commit 'f4642bc84b7d7d39d0455498b1944e492185c8d4':
  Update status area and emergency call logic to match new spec
2012-10-30 09:17:45 -07:00
Svetoslav Ganov
8f1aaa147d am 567fa759: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
* commit '567fa759493ac38648674d3121c3b9d731653705':
  Lockscreen accessibility - strings.
2012-10-30 09:14:55 -07:00
Danielle Millett
e984610567 am 1108a2cb: Added a makeInvisible call to Face Unlock
* commit '1108a2cb412b054cc9e4acc48182c46c45180c0c':
  Added a makeInvisible call to Face Unlock
2012-10-30 09:14:46 -07:00
Adam Powell
2d22c9d720 am cfc3086b: Keyguard polishing
* commit 'cfc3086b18396df03f982fb98112649dc5b5a6f2':
  Keyguard polishing
2012-10-30 09:14:42 -07:00
Baligh Uddin
8904f8faf0 am 3cbc6cd8: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '3cbc6cd87dc854a294c6960cda01bca02ca0af7f':
  Import translations. DO NOT MERGE
2012-10-30 09:14:04 -07:00
Baligh Uddin
5ec9e005dc am f7d69a95: am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'f7d69a9558f29920fa8db30e08b467a8f185ef1f':
2012-10-30 09:14:00 -07:00
Jim Miller
f4642bc84b am 0b728244: Update status area and emergency call logic to match new spec
* commit '0b728244dc87b4a453f2191c2cb37a86e91aee0a':
  Update status area and emergency call logic to match new spec
2012-10-30 09:13:46 -07:00
John Spurlock
bb7faa1f45 am 0cb115f6: am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
* commit '0cb115f6bcfbff970cd66d89c9db951b4735c801':
  Use settings to persist sticky widget.
2012-10-30 08:53:17 -07:00
Daniel Sandler
ee12c3063d am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
* commit '0f527aa5f64ba43eb75a00baa162191b6bc8a076':
  Improved handle touch interaction.
2012-10-30 08:53:13 -07:00
Daniel Sandler
c55eba7f97 am a01cfd01: am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
* commit 'a01cfd01ac0e836c690cb9bf723c777dcf86d9c9':
  Bigger lock icon.
2012-10-30 08:53:10 -07:00
Adam Cohen
c19401a793 am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
* commit '7fb0021d18a6491fdc816027081bff8c8d65f5aa':
  Polish to 3d carousel and standard pager
2012-10-30 08:53:02 -07:00
Chris Wren
b04d5c94e7 am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
* commit 'fe9356c074278f1a936fbd2d9eb00d9cf1914984':
  single unlock target with honycomb semantics
2012-10-30 08:52:55 -07:00
Daniel Sandler
4f98fbe9a9 am 83372881: am fdbbbba4: Updated add-widget graphics
* commit '8337288183c9b5e145b44dbc8bae77f463edb4fc':
  Updated add-widget graphics
2012-10-30 08:52:52 -07:00
John Spurlock
0cb115f6bc am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
* commit 'b2f21c53cf423cad5cf2f5d92579258decb40631':
  Use settings to persist sticky widget.
2012-10-30 08:49:05 -07:00
Daniel Sandler
0f527aa5f6 am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
* commit 'bc676a0a1d15e932ca74bb94f3ae392e0a9dbbe2':
  Improved handle touch interaction.
2012-10-30 08:49:01 -07:00
Daniel Sandler
a01cfd01ac am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
* commit 'f002bf19e841301388238ef19552c9dfc24d4d72':
  Bigger lock icon.
2012-10-30 08:48:57 -07:00
Adam Cohen
7fb0021d18 am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
* commit 'effc03a952a881108fcbb51d4007ea0c21694077':
  Polish to 3d carousel and standard pager
2012-10-30 08:48:48 -07:00
Chris Wren
fe9356c074 am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
* commit '1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
  single unlock target with honycomb semantics
2012-10-30 08:48:38 -07:00
Daniel Sandler
8337288183 am fdbbbba4: Updated add-widget graphics
* commit 'fdbbbba4cd4807bed1200f714609d4000501d4ee':
  Updated add-widget graphics
2012-10-30 08:48:35 -07:00
Svetoslav Ganov
567fa75949 Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev 2012-10-29 23:15:16 -07:00
Svetoslav Ganov
3cd4640c0e Lockscreen accessibility - strings.
Change-Id: Ia0f5a6356592f53081040667d20abf5f8eb09ad2
2012-10-29 23:11:53 -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
Dianne Hackborn
ef03a7f441 Work on issue #7343200: Fails to show wallpaper in the background...
...for lockscreen sometimes and remains black / blank

Add some debug output to try to track down what is going on.

Change-Id: I98a96c5da9c04b988e948f6fc2766d927db49ebf
2012-10-29 18:46:52 -07: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
Mathias Agopian
ecd580d7da am fdd714f8: am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit 'fdd714f8d52a7ab2b96839b7cfe8ed917417383b':
  fix an overflow in the orientation sensonr calculations
2012-10-29 16:55:40 -07:00
Amith Yamasani
e668794230 Only send broadcasts to registered receivers
Fix for issue found in #7420259

Not sure if this fixes the actual ringtone issue, but it clears the way.

Change-Id: I7fd5584df2dc254ba7281f57e51143c79bfcff63
2012-10-29 16:54:29 -07:00
Mathias Agopian
e4335adad2 am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf':
  fix an overflow in the orientation sensonr calculations
2012-10-29 16:53:19 -07:00
Mathias Agopian
fdd714f8d5 am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit '0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf':
  fix an overflow in the orientation sensonr calculations
2012-10-29 16:52:41 -07:00
Mathias Agopian
0da554acfb Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev 2012-10-29 16:49:48 -07:00
Mathias Agopian
278a966e80 fix an overflow in the orientation sensonr calculations
this would cause the TYPE_ORIENTATION sensor to report NaN after
40 to 800 hours of up-time. this problem only affects the older
and deprecated SensorListener API.

Bug: 7434842
Change-Id: Ie8593cca9c98e4907e417db4106c06151e3ee9a1
2012-10-29 16:03:46 -07:00