88933 Commits

Author SHA1 Message Date
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
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
Amith Yamasani
aac4d9fe55 QS uses nickname for multiuser and profile name for singleuser.
Bug: 7400662
Change-Id: I3299ee70acaa7341ec11b4774426e22182ffd170
2012-10-30 14:32:45 -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
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
Victoria Lease
517303e05b am ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
* commit 'ac14efce4b9575ac1de567073d7088162d4d2eed':
  DO NOT MERGE suggest LocationRequest rather than Criteria
2012-10-30 13:31:44 -07:00
Victoria Lease
1863738c77 am ac14efce: (-s ours) Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
* commit 'ac14efce4b9575ac1de567073d7088162d4d2eed':
  DO NOT MERGE suggest LocationRequest rather than Criteria
2012-10-30 13:31:36 -07:00
Victoria Lease
95ba9e8ba3 am 8756c60c: Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev
* commit '8756c60c42e56cd3667c6eae0d2ae7025b457031':
  DO NOT MERGE clarify Geofence.createCircle() param ranges
2012-10-30 13:28:00 -07:00
Victoria Lease
54f1ce1d2b am 8756c60c: (-s ours) Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev
* commit '8756c60c42e56cd3667c6eae0d2ae7025b457031':
  DO NOT MERGE clarify Geofence.createCircle() param ranges
2012-10-30 13:27:38 -07:00
Victoria Lease
ac14efce4b Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev 2012-10-30 13:26:38 -07:00
Victoria Lease
8756c60c42 Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev 2012-10-30 13:24:26 -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
Amith Yamasani
0c29371712 Don't clean up wallpaper map entry when stopping a user.
Sometimes on quickly stopping and starting a user, a race condition
causes the user entry to disappear, causing crashes in Launcher and
SystemUI. Removing this step, since it doesn't really leave much
residue behind.

Bug: 7434849
Change-Id: Ia188602f1a79f75d307397459c2a03fadee4c722
2012-10-30 12:23: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
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
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
Victoria Lease
be7a29471e DO NOT MERGE clarify Geofence.createCircle() param ranges
Cherry-pick I2ca647595275fde610047f681722b19dc41416da from master:

This commit adds the valid ranges to the latitude/longitude
parameters in Geofence.createCircle()'s javadoc.

Bug: 7172696
Change-Id: Iecef09a5fa11be586b05f9f75107c3e77e637d28
2012-10-30 11:29:38 -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
Victoria Lease
34c7ed0dbd DO NOT MERGE suggest LocationRequest rather than Criteria
This is a cherry-pick of Ieb5ef28ab1e6b4b3c4d2b8ceb3a601083b4f8e2f
from master.

LocationProvider's javadoc suggests using Criteria instead of
LocationProvider, which is deprecated. Criteria is deprecated, too,
now, so we suggest LocationRequest instead.

Bug: 7434865
Change-Id: I00375a419c745bb46ff454bc5e4aa0bfac2b3fc3
2012-10-30 10:52:25 -07:00
Dianne Hackborn
8f2251403d 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:49 -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
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
ed1eca0543 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:09 -07:00
Amith Yamasani
13a6df91d9 Merge "Only send broadcasts to registered receivers" into jb-mr1-dev 2012-10-30 10:00:04 -07:00
Roman Nurik
fe49e125b4 am 825a094e: Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
* commit '825a094eda418b230199aea0f940a881197ea5d3':
  Update Device Art Generator for Nexus 4, 7, and 10.
2012-10-30 09:58:52 -07:00
Roman Nurik
53af017be5 am 825a094e: Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
* commit '825a094eda418b230199aea0f940a881197ea5d3':
  Update Device Art Generator for Nexus 4, 7, and 10.
2012-10-30 09:58:25 -07:00
Roman Nurik
825a094eda Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev 2012-10-30 09:56:02 -07:00
Chris Wren
a014c7a0df am 16d83fd1: Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev
* commit '16d83fd13a91c124735e7f4ee2244214ad8523da':
  post user activity on widget pager moves
2012-10-30 09:15:06 -07:00
John Spurlock
7d14e57c58 am cf69c56b: "Fix camera widget scale-up regression." -> frameworks/base
* commit 'cf69c56b8336e2bd5c8e20f948cc80ca53e0c25a':
  "Fix camera widget scale-up regression." -> frameworks/base
2012-10-30 09:15:03 -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
Adam Cohen
eec804e364 am 8a7785c7: Cleaning up the way in which the challenge influences widget size on first measure pass
* commit '8a7785c7aa2df74203276299e10b0d9056cd0560':
  Cleaning up the way in which the challenge influences widget size on first measure pass
2012-10-30 09:14:52 -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
Winson Chung
49d42b9318 am 7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
* commit '7bf93cf50fc028a50433741b4e1f1ee8b80f74f0':
  Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
2012-10-30 09:14:38 -07:00
Kenny Root
b769ff3b4f am 750d5e11: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
* commit '750d5e11dffa89f90a71aa55244d069ebd8e39d0':
2012-10-30 09:14:34 -07:00
Mathias Agopian
49d9a615fb am e4335ada: am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
* commit 'e4335adad2c726c6ac49927ae71cecfc8089c3f3':
2012-10-30 09:14:30 -07:00
John Spurlock
c6b4cfa765 am d9910249: Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
* commit 'd9910249a4127c351f23d46623df645750d3d21e':
  "Implement grace period for camera widget." -> frame/base
2012-10-30 09:14:26 -07:00
Eric Laurent
7066b888c2 am c864d952: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit 'c864d952bcb0f229b98254667f273e7a91da5d45':
2012-10-30 09:14:23 -07:00
Jean-Michel Trivi
805345b2b6 am f1c62be6: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit 'f1c62be6b4f1d631666deedd4ef02981ed7536f9':
2012-10-30 09:14:19 -07:00
Baligh Uddin
38e2dbb51b am b560cfb3: am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b560cfb3b6595939d1cf7bf9ce9ce5d352254993':
2012-10-30 09:14:15 -07:00
Baligh Uddin
39e670af31 am be7a814e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'be7a814e0ec2b419f45abbab520f529aafdc5c65':
  Import translations. DO NOT MERGE
2012-10-30 09:14:12 -07:00