87425 Commits

Author SHA1 Message Date
Dave Burke
b95bc6870a Fix ordering bug
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:54:15 -07:00
The Android Automerger
02a5988f41 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:12:18 -07:00
Ed Heyl
5c12bc5851 Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev 2012-10-30 18:04:31 -07:00
Adam Cohen
a371e5315e Merge "Fix content alpha" into jb-mr1-lockscreen-dev 2012-10-30 17:51:03 -07:00
Amith Yamasani
20329dcb37 Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev 2012-10-30 17:47:58 -07:00
Chet Haase
2e6a65ca8f am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
  WindowManager shouldn't layout non-visible windows
2012-10-30 17:45:55 -07:00
Amith Yamasani
77007ac6a4 am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.
2012-10-30 17:44:05 -07:00
Chet Haase
27f752eb1d Merge "WindowManager shouldn't layout non-visible windows" into jb-mr1-dev 2012-10-30 17:42:43 -07:00
Adam Cohen
ab8635d179 Fix content alpha
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
2012-10-30 17:40:43 -07:00
Amith Yamasani
a07d047f34 Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev 2012-10-30 17:40:13 -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
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
Dirk Dougherty
0a12d86d47 am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit '0572827720e191b3e6fe4466ae09058f5d578c57':
  Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:10:19 -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
Dirk Dougherty
0572827720 am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit 'c6df397effaf5417c8adcd72704cf7ceba59adfb':
  Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:07:02 -07:00
Dirk Dougherty
c6df397eff am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit 'a76f1dfc7740fa506c8ba4058e2ad8b90b476fe8':
  Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:04:48 -07:00
Dirk Dougherty
a76f1dfc77 am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit 'c7255569bba20d94200dc05ffd5ce7b61bdc569c':
  Doc change: fix broken link in publishing steps TOC.
2012-10-30 17:01:53 -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
Dirk Dougherty
c7255569bb Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 2012-10-30 16:56:58 -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
Dirk Dougherty
e31d80bdaa Doc change: fix broken link in publishing steps TOC.
Change-Id: I1b7453dfe276be40a23f1bd59a463e6d4f9b0412
2012-10-30 16:51:54 -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
Dianne Hackborn
7710199376 Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev 2012-10-30 16:37:19 -07:00
Chet Haase
9cceae9a5f WindowManager shouldn't layout non-visible windows
A recent change in WindowManager made background windows perform layout
(when they should really be left alone). This resulted in artifacts
where rotating the device and then going to a backgrojnd activity (launcher,
Recents) would briefly show that activity in the wrong size/orientation, then
flash to the correct one after a proper layout.

This fix is a simple workaround, leaving in the original fix that the code
change addressed (for keyguard orientation changes), while going back to the
previous (don't layout gone windows) for all other cases.

Issue #7428221 sometimes recents is drawn off-center and then fixes itself

Change-Id: I41b47933c2bd86f29133853d3387bb7294be8f48
2012-10-30 16:35:45 -07: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
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
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
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