OSDN Git Service
Michael Jurka [Wed, 31 Oct 2012 01:30:52 +0000 (18:30 -0700)]
Use new keyguard appwidget picker
Also, remove ability to filter widgets by feature
in appwidget picker in anticipation of api change
Change-Id: I325de0b98f03d3a250758d504229ea27794b5330
Amith Yamasani [Wed, 31 Oct 2012 20:09:21 +0000 (13:09 -0700)]
am
03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
* commit '
03f7ebfeaadb3f03c9a9a6405276fb702ad11fe1':
Relax permission requirements for posting notifications across users
Amith Yamasani [Wed, 31 Oct 2012 20:06:56 +0000 (13:06 -0700)]
Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
Jim Miller [Wed, 31 Oct 2012 19:37:53 +0000 (12:37 -0700)]
Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
Jim Miller [Wed, 31 Oct 2012 19:35:45 +0000 (12:35 -0700)]
Remove extra KeyguardViewStateManager construction
Change-Id: I0f64569876d923c2b4b7ac3918f3a0458a56b16c
Chris Wren [Wed, 31 Oct 2012 19:34:50 +0000 (12:34 -0700)]
Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
Chris Wren [Tue, 30 Oct 2012 15:22:58 +0000 (11:22 -0400)]
Update bouncer behavior on tablets.
Bug:
7411293
Change-Id: I1000987b9b5d481d04e095c4f8eb9eda44a81021
Proto:Id: I81fcf3541a81812b212963a5c4b379424506bc5a
Baligh Uddin [Wed, 31 Oct 2012 17:37:04 +0000 (10:37 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
Baligh Uddin [Wed, 31 Oct 2012 17:35:22 +0000 (10:35 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken Build:
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1
This reverts commit
30a3eeaa4bc8d654b6ff3beb109b6af3f347b135
Change-Id: I505c6c1f3444c80519fbee50d7dda656f5c9b76e
Baligh Uddin [Wed, 31 Oct 2012 17:21:55 +0000 (10:21 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Wed, 31 Oct 2012 17:12:54 +0000 (10:12 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Dave Burke [Wed, 31 Oct 2012 04:51:11 +0000 (21:51 -0700)]
am
86e1b966: Fix ordering bug
* commit '
86e1b96666af3693ec1bf220272fbc90d73d3cde':
Fix ordering bug
Dave Burke [Wed, 31 Oct 2012 04:45:12 +0000 (21:45 -0700)]
Fix ordering bug
Bug:
7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
Adam Powell [Wed, 31 Oct 2012 04:00:40 +0000 (21:00 -0700)]
Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
Adam Powell [Wed, 31 Oct 2012 03:56:45 +0000 (20:56 -0700)]
Fix keyguard bugs
Integrate from proto app
Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.
Fix bug
7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.
Use layers when moving the security view around.
Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
Michael Jurka [Wed, 31 Oct 2012 03:55:48 +0000 (20:55 -0700)]
Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
Michael Jurka [Wed, 31 Oct 2012 03:50:21 +0000 (20:50 -0700)]
Fix crash on boot
Jim Miller [Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)]
Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
Jim Miller [Wed, 31 Oct 2012 03:37:57 +0000 (20:37 -0700)]
Re-enable transition animation between face unlock and backup
Change-Id: Ia90cf73e400f45c8b73f34cbc521dcbc62258ca8
Jim Miller [Wed, 31 Oct 2012 03:17:47 +0000 (20:17 -0700)]
Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
Jim Miller [Wed, 31 Oct 2012 03:12:53 +0000 (20:12 -0700)]
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
Baligh Uddin [Wed, 31 Oct 2012 02:35:18 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93ab875ed71833efc99917a6474f1401fb47c263
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 02:13:28 +0000 (19:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0909dffc40bf6e8325b97aa0c5a0ccc07830b330
Auto-generated-cl: translation import
Svetoslav Ganov [Wed, 31 Oct 2012 01:40:50 +0000 (18:40 -0700)]
Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
Svetoslav Ganov [Wed, 31 Oct 2012 01:33:21 +0000 (18:33 -0700)]
Lockscreen accessibility - strings.
Change-Id: Ic38c2d3e3052979f4f1569e851f365c10d8c93f0
Svetoslav Ganov [Wed, 31 Oct 2012 01:34:15 +0000 (18:34 -0700)]
am
0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '
0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
Fixing view accessibility classification for recents.
Svetoslav Ganov [Wed, 31 Oct 2012 01:30:45 +0000 (18:30 -0700)]
Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
Ed Heyl [Wed, 31 Oct 2012 01:07:39 +0000 (18:07 -0700)]
am
5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit '
5c12bc5851056f114893f3d381f9fc8785e2cdb0':
Amith Yamasani [Wed, 31 Oct 2012 01:07:39 +0000 (18:07 -0700)]
am
20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
* commit '
20329dcb37fffca1de3ded6b58341e87cc43c4a9':
QS uses nickname for multiuser and profile name for singleuser.
Ed Heyl [Wed, 31 Oct 2012 01:04:31 +0000 (18:04 -0700)]
Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev
Amith Yamasani [Tue, 30 Oct 2012 21:32:45 +0000 (14:32 -0700)]
QS uses nickname for multiuser and profile name for singleuser.
Bug:
7400662
Change-Id: I3299ee70acaa7341ec11b4774426e22182ffd170
Adam Cohen [Wed, 31 Oct 2012 00:50:57 +0000 (17:50 -0700)]
Merge "Fix content alpha" into jb-mr1-lockscreen-dev
Amith Yamasani [Wed, 31 Oct 2012 00:47:58 +0000 (17:47 -0700)]
Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
Chet Haase [Wed, 31 Oct 2012 00:45:55 +0000 (17:45 -0700)]
am
27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
* commit '
27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
WindowManager shouldn't layout non-visible windows
Amith Yamasani [Wed, 31 Oct 2012 00:44:05 +0000 (17:44 -0700)]
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.
Chet Haase [Wed, 31 Oct 2012 00:42:42 +0000 (17:42 -0700)]
Merge "WindowManager shouldn't layout non-visible windows" into jb-mr1-dev
Adam Cohen [Wed, 31 Oct 2012 00:31:32 +0000 (17:31 -0700)]
Fix content alpha
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
Amith Yamasani [Wed, 31 Oct 2012 00:40:12 +0000 (17:40 -0700)]
Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev
Danielle Millett [Wed, 31 Oct 2012 00:32:59 +0000 (17:32 -0700)]
Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev
Brian Colonna [Wed, 31 Oct 2012 00:32:36 +0000 (17:32 -0700)]
Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev
Danielle Millett [Wed, 31 Oct 2012 00:18:44 +0000 (20:18 -0400)]
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
Adam Cohen [Wed, 31 Oct 2012 00:11:00 +0000 (17:11 -0700)]
Merge "Making the reordering play nice with the 3D widget carousel" into jb-mr1-lockscreen-dev
Dirk Dougherty [Wed, 31 Oct 2012 00:10:19 +0000 (17:10 -0700)]
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.
Casey Burkhardt [Wed, 31 Oct 2012 00:07:01 +0000 (17:07 -0700)]
Fixing view accessibility classification for recents.
Change-Id: I0324fe322d97ee35105d7d71442fa79663e0fdfa
Bug:
7438790
Adam Cohen [Tue, 30 Oct 2012 23:48:22 +0000 (16:48 -0700)]
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
Dirk Dougherty [Wed, 31 Oct 2012 00:07:02 +0000 (17:07 -0700)]
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.
Dirk Dougherty [Wed, 31 Oct 2012 00:04:48 +0000 (17:04 -0700)]
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.
Dirk Dougherty [Wed, 31 Oct 2012 00:01:53 +0000 (17:01 -0700)]
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.
Jim Miller [Tue, 30 Oct 2012 23:57:53 +0000 (16:57 -0700)]
Merge "Fill in logic in WidgetPager to ignore music when reordering." into jb-mr1-lockscreen-dev
Dirk Dougherty [Tue, 30 Oct 2012 23:56:57 +0000 (16:56 -0700)]
Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
Jim Miller [Tue, 30 Oct 2012 23:55:05 +0000 (16:55 -0700)]
Merge "Implement correct music widget positioning in keyguard" into jb-mr1-lockscreen-dev
Dirk Dougherty [Tue, 30 Oct 2012 23:51:54 +0000 (16:51 -0700)]
Doc change: fix broken link in publishing steps TOC.
Change-Id: I1b7453dfe276be40a23f1bd59a463e6d4f9b0412
Dianne Hackborn [Tue, 30 Oct 2012 23:39:54 +0000 (16:39 -0700)]
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.
Dianne Hackborn [Tue, 30 Oct 2012 23:37:18 +0000 (16:37 -0700)]
Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
Chet Haase [Tue, 30 Oct 2012 23:35:45 +0000 (16:35 -0700)]
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
Amith Yamasani [Tue, 30 Oct 2012 22:28:27 +0000 (15:28 -0700)]
Relax permission requirements for posting notifications across users
Bug:
7430689
Change-Id: I2430b20137705ed2d6dc0f870690acda0662392b
Brian Colonna [Tue, 30 Oct 2012 22:34:39 +0000 (18:34 -0400)]
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
Jim Miller [Tue, 30 Oct 2012 21:57:29 +0000 (14:57 -0700)]
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
Amith Yamasani [Tue, 30 Oct 2012 21:32:45 +0000 (14:32 -0700)]
QS uses nickname for multiuser and profile name for singleuser.
Bug:
7400662
Change-Id: I3299ee70acaa7341ec11b4774426e22182ffd170
Jim Miller [Tue, 30 Oct 2012 21:24:57 +0000 (14:24 -0700)]
Merge "Attempt to fix bug on devices where multi-user support is disabled." into jb-mr1-lockscreen-dev
Jim Miller [Tue, 30 Oct 2012 21:12:22 +0000 (14:12 -0700)]
Attempt to fix bug on devices where multi-user support is disabled.
Bug
7437751
Change-Id: Iff9f6a5a91fb9dd69b7176a5febb1d6e158d90b6
Jim Miller [Tue, 30 Oct 2012 02:11:50 +0000 (19:11 -0700)]
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
Brian Colonna [Tue, 30 Oct 2012 20:41:38 +0000 (13:41 -0700)]
Merge "FUL uses square aspect ratio for all layouts fixes b/
7426399" into jb-mr1-lockscreen-dev
Victoria Lease [Tue, 30 Oct 2012 20:31:36 +0000 (13:31 -0700)]
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
Victoria Lease [Tue, 30 Oct 2012 20:27:38 +0000 (13:27 -0700)]
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
Victoria Lease [Tue, 30 Oct 2012 20:24:10 +0000 (13:24 -0700)]
Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
Victoria Lease [Tue, 30 Oct 2012 20:24:14 +0000 (13:24 -0700)]
Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev
Winson Chung [Tue, 30 Oct 2012 19:28:18 +0000 (12:28 -0700)]
Merge "Moving persistence calls to background." into jb-mr1-lockscreen-dev
John Spurlock [Tue, 30 Oct 2012 19:24:35 +0000 (12:24 -0700)]
Merge "Render camera widget correctly after shell restart." into jb-mr1-lockscreen-dev
Amith Yamasani [Tue, 30 Oct 2012 19:23:52 +0000 (12:23 -0700)]
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
Daniel Sandler [Tue, 30 Oct 2012 19:11:50 +0000 (12:11 -0700)]
Merge "Impose a height & width downward on challenge views." into jb-mr1-lockscreen-dev
Craig Mautner [Mon, 8 Oct 2012 20:33:11 +0000 (13:33 -0700)]
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
John Spurlock [Tue, 30 Oct 2012 15:47:23 +0000 (11:47 -0400)]
Render camera widget correctly after shell restart.
Bug:
7440304
Change-Id: I1ad8573cc843142d77436fd8361d7fc613b09f21
Winson Chung [Tue, 30 Oct 2012 19:03:18 +0000 (12:03 -0700)]
Moving persistence calls to background.
Change-Id: Ief3b0862dfd24d520ec88afb5bbb9954ee90f2ac
Brian Colonna [Tue, 30 Oct 2012 18:48:55 +0000 (14:48 -0400)]
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
Victoria Lease [Tue, 30 Oct 2012 17:44:14 +0000 (10:44 -0700)]
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
Adam Cohen [Tue, 30 Oct 2012 18:22:46 +0000 (11:22 -0700)]
Merge "Addressing a couple comments on previous CL" into jb-mr1-lockscreen-dev
Adam Cohen [Tue, 30 Oct 2012 18:19:48 +0000 (11:19 -0700)]
Addressing a couple comments on previous CL
Change-Id: I6ee066a5e6c2dadff921bb2ed7e91ea2601eec05
Daniel Sandler [Tue, 30 Oct 2012 17:29:50 +0000 (13:29 -0400)]
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
Winson Chung [Tue, 30 Oct 2012 17:56:37 +0000 (10:56 -0700)]
Fixing some regressions in tablet reordering/deleting.
Change-Id: Ib3e48fa2606c0259603f6daf3b2ef72e1c8e292d
Victoria Lease [Mon, 29 Oct 2012 22:07:50 +0000 (15:07 -0700)]
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
Dianne Hackborn [Tue, 30 Oct 2012 17:49:49 +0000 (10:49 -0700)]
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...
Dianne Hackborn [Tue, 30 Oct 2012 17:45:49 +0000 (10:45 -0700)]
Merge "Work on issue #
7343200: Fails to show wallpaper in the background..." into jb-mr1-dev
Amith Yamasani [Tue, 30 Oct 2012 17:02:09 +0000 (10:02 -0700)]
am
13a6df91: Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
* commit '
13a6df91d9016063057aed07d21c8135f22f7f18':
Only send broadcasts to registered receivers
Amith Yamasani [Tue, 30 Oct 2012 17:00:00 +0000 (10:00 -0700)]
Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
Roman Nurik [Tue, 30 Oct 2012 16:58:25 +0000 (09:58 -0700)]
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.
Roman Nurik [Tue, 30 Oct 2012 16:55:53 +0000 (09:55 -0700)]
Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
John Spurlock [Tue, 30 Oct 2012 16:02:12 +0000 (09:02 -0700)]
Merge "Disable lockscreen window anim when launching camera." into jb-mr1-lockscreen-dev
John Spurlock [Tue, 30 Oct 2012 15:05:55 +0000 (11:05 -0400)]
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
Chris Wren [Tue, 30 Oct 2012 15:20:36 +0000 (08:20 -0700)]
Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev
Roman Nurik [Mon, 29 Oct 2012 22:08:19 +0000 (15:08 -0700)]
Update Device Art Generator for Nexus 4, 7, and 10.
This CL also adds an 'older devices' section containing Nexus S, Galaxy Nexus,
and the Motorola XOOM.
Change-Id: Icca64ae5debe79325fbea38f79d33cd4ea85afb7
John Spurlock [Tue, 30 Oct 2012 12:46:57 +0000 (08:46 -0400)]
"Fix camera widget scale-up regression." -> frameworks/base
lockhotness change-id: I69ccfa3a873943ab2e159d15937d5fb13f7acabd
Bug:
7439300
Change-Id: I9e9eeae16b4e76d85a8145f3b198c22ad2e923e9
Svetoslav Ganov [Tue, 30 Oct 2012 06:15:13 +0000 (23:15 -0700)]
Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
Svetoslav Ganov [Tue, 30 Oct 2012 06:11:17 +0000 (23:11 -0700)]
Lockscreen accessibility - strings.
Change-Id: Ia0f5a6356592f53081040667d20abf5f8eb09ad2
Adam Cohen [Tue, 30 Oct 2012 05:01:33 +0000 (22:01 -0700)]
Cleaning up the way in which the challenge influences widget size on first measure pass
-> This change ensures that on first draw, the widget is the appropriate size if the
security challenge is covering it.
-> This change is in preparation for some new policy surrounding widget sizing --
with this new policy, a given widget may need to be small even if the page is
not being covered by the challenge. Hence, we propogate this small size to
all the pages, whether or not they are covered. The pages will eventually
use this.
-> Ensure that paging hints are shown correctly (with the new sticky widget
logic the page can be switched, and we weren't always seeing the appropriate
hints).
-> Also ensuring that the page is set correctly on first draw -- generally
this change should make it so everything is right on the first draw.
Change-Id: I7e03be9b027aed0ebb0fada05652b4226fd23897
Danielle Millett [Tue, 30 Oct 2012 02:16:32 +0000 (22:16 -0400)]
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
Dianne Hackborn [Tue, 30 Oct 2012 01:46:52 +0000 (18:46 -0700)]
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
Adam Powell [Tue, 30 Oct 2012 01:21:31 +0000 (18:21 -0700)]
Keyguard polishing
Integrate from proto app
* New assets
* Layout changes
* Dragging behavior change for sliding challenge
* Realign camera for new padding
Change-Id: Ia177c60f59f1fc74000d95fc39b048321acf1246
Winson Chung [Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)]
Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
Winson Chung [Tue, 30 Oct 2012 00:43:18 +0000 (17:43 -0700)]
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
- Fixing issue where you can long press a widget to reorder while the challenge is up
Change-Id: I6ef2fa050a5ebc35d1c3e373bb27519580ebe03d