OSDN Git Service
Raph Levien [Wed, 31 Oct 2012 23:39:09 +0000 (16:39 -0700)]
am
54385d91: am
c01d1045: Merge "Fix for bug
7400445 regression in background drawable" into jb-mr1-dev
* commit '
54385d91f0a0ddfd1ded9e94e43f979f99765f43':
Fix for bug
7400445 regression in background drawable
Baligh Uddin [Wed, 31 Oct 2012 23:39:03 +0000 (16:39 -0700)]
am
0abea6d6: am
9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '
0abea6d6e78758e225f4e0b1fcd3b92be1c4e63b':
Revert "Removed symbol causing compile breakage."
Baligh Uddin [Wed, 31 Oct 2012 23:39:02 +0000 (16:39 -0700)]
am
ff26fc74: (-s ours) am
83e9187d: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
ff26fc74fef8dd946a593d42684f5d705c8ca357':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 31 Oct 2012 23:33:35 +0000 (16:33 -0700)]
am
94a69e34: (-s ours) am
a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
94a69e34583100d993b9a74a314ee09e7db87faa':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 23:31:25 +0000 (16:31 -0700)]
am
f3820b13: am
dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
* commit '
f3820b139e7a79df959c977cb83324639652c11a':
Removed symbol causing compile breakage.
Raph Levien [Wed, 31 Oct 2012 23:28:08 +0000 (16:28 -0700)]
am
c01d1045: Merge "Fix for bug
7400445 regression in background drawable" into jb-mr1-dev
* commit '
c01d1045ef6c79000afc6f07a74ee7963a2092ac':
Fix for bug
7400445 regression in background drawable
Baligh Uddin [Wed, 31 Oct 2012 23:28:05 +0000 (16:28 -0700)]
am
9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '
9e3a900c35d6af749d0c363dadf627384eed687a':
Revert "Removed symbol causing compile breakage."
Baligh Uddin [Wed, 31 Oct 2012 23:28:00 +0000 (16:28 -0700)]
am
83e9187d: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
83e9187d158b891459afc182c675dca56c7dcd93':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 31 Oct 2012 23:27:56 +0000 (16:27 -0700)]
am
a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a68aa4e34357eccd7af4d7e29e574b6bc9c61d66':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 23:27:53 +0000 (16:27 -0700)]
am
dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
* commit '
dd73325106c4d52c734647d65530e46eb70f4749':
Removed symbol causing compile breakage.
Raph Levien [Wed, 31 Oct 2012 23:18:04 +0000 (16:18 -0700)]
Merge "Fix for bug
7400445 regression in background drawable" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 23:18:06 +0000 (16:18 -0700)]
Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 23:16:22 +0000 (16:16 -0700)]
Revert "Removed symbol causing compile breakage."
breaks build.
This reverts commit
d8a5792ae760a22aed4aa4ffd2caa5161d61baad
Change-Id: Ib92e9eee7f581bd9c508a735ef8a770316565d25
Baligh Uddin [Wed, 31 Oct 2012 23:14:44 +0000 (16:14 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 23:13:57 +0000 (16:13 -0700)]
Revert "Import translations. DO NOT MERGE"
breaks build.
This reverts commit
a7cd483e4d7f097487ca9babc27316c11f2e4afb
Change-Id: I5690d3c9048f70b33a3e9610b821873a335a8357
Baligh Uddin [Wed, 31 Oct 2012 22:31:33 +0000 (15:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 22:28:44 +0000 (15:28 -0700)]
Merge "Removed symbol causing compile breakage." into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 22:07:58 +0000 (15:07 -0700)]
am
63f43d56: am
6bd881bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
63f43d56198d8423f875d23e3bb2559b652d8d5a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 17:46:54 +0000 (10:46 -0700)]
Removed symbol causing compile breakage.
Seems like this string was removed in
https://googleplex-android-review.googlesource.com/#/c/247477
Change-Id: I2cc96143980d326cfdbc1db3b2a3c9766963ef03
Baligh Uddin [Wed, 31 Oct 2012 22:05:02 +0000 (15:05 -0700)]
am
6bd881bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6bd881bd328835f9b042d859cb496ed6f612c17b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:02:30 +0000 (15:02 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Raph Levien [Wed, 31 Oct 2012 20:53:57 +0000 (13:53 -0700)]
Fix for bug
7400445 regression in background drawable
The opacity calculation for a gradient drawable of shape must take
rounded corners into account - if the corner radius is nonzero, then the
shape is translucent rather than opaque. Previously the code always
assumed that such rectangles were fully opaque, which led to the
background (visible behind the rectangle) not getting drawn.
This patch simply checks for corner radius in addition to shape and
computes opacity as translucent in the nonzero case.
Change-Id: Iaf4d24abc6ecf49f85c82972b8f998700c83295e
Amith Yamasani [Wed, 31 Oct 2012 20:11:50 +0000 (13:11 -0700)]
am
47ece2e5: am
03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
* commit '
47ece2e53e50201a6f73fb7a554d856f3b4519c8':
Relax permission requirements for posting notifications across users
Baligh Uddin [Wed, 31 Oct 2012 20:11:50 +0000 (13:11 -0700)]
am
53b029b6: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
* commit '
53b029b6201dbe754d478f3dfcbd4f1e5ee5b41e':
Revert "Import translations. DO NOT MERGE"
Amith Yamasani [Wed, 31 Oct 2012 20:09:42 +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
Jean-Baptiste Queru [Wed, 31 Oct 2012 18:43:24 +0000 (11:43 -0700)]
Merge "Fix build - Add back symbol that's still needed" into jb-mr1-dev-plus-aosp
Jean-Baptiste Queru [Wed, 31 Oct 2012 17:35:33 +0000 (10:35 -0700)]
Fix build - Add back symbol that's still needed
Change-Id: Iee59db7950bd83a480baa0b63729b16563251ad9
Baligh Uddin [Wed, 31 Oct 2012 17:37:11 +0000 (10:37 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
Baligh Uddin [Wed, 31 Oct 2012 17:35:37 +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
9ab7f479f9ca5f1e27aa09b5f6073d88b8e98f60
Change-Id: I448e20bb060ebfe5f351b5a3d906d9e7768252b1
Baligh Uddin [Wed, 31 Oct 2012 17:23:36 +0000 (10:23 -0700)]
am
74db3bb8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
74db3bb81bd67429ecd7a8b7273c02c1cf51c055':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 17:23:35 +0000 (10:23 -0700)]
am
8339bf19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
8339bf19ece1bbf2b4441e1e07d7fa8e331111d9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 17:20:15 +0000 (10:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 31 Oct 2012 17:11:17 +0000 (10:11 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
The Android Open Source Project [Wed, 31 Oct 2012 16:16:38 +0000 (09:16 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ic363e92df81b458869dc8c26ad02642886b0538a
Dave Burke [Wed, 31 Oct 2012 04:45:12 +0000 (21:45 -0700)]
Fix ordering bug
Bug:
7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
Dave Burke [Wed, 31 Oct 2012 04:53:16 +0000 (21:53 -0700)]
am
ee6e3354: am
86e1b966: Fix ordering bug
* commit '
ee6e3354484233de65da431f0e2abbcd695d7dca':
Fix ordering bug
Dave Burke [Wed, 31 Oct 2012 04:51:08 +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
The Android Automerger [Wed, 31 Oct 2012 03:12:18 +0000 (20:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 02:34:07 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01d1dafe9b0dc9d6fb4d90ff97fc39cbeca4f3f8
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 02:32:59 +0000 (19:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6df01942373d95ef42198afb69cf892fbdbec798
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 02:10:48 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I359781293df3f79daa98691719636baac0f93afb
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 02:08:26 +0000 (19:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a6cc89a0cdc7d6fa5be47c926e69555db4e9ba9
Auto-generated-cl: translation import
Svetoslav Ganov [Wed, 31 Oct 2012 01:34:56 +0000 (18:34 -0700)]
am
1728e550: am
0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '
1728e5509ee650eaebb53f42b47aa5e601819f1c':
Fixing view accessibility classification for recents.
Svetoslav Ganov [Wed, 31 Oct 2012 01:33:29 +0000 (18:33 -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:10:09 +0000 (18:10 -0700)]
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.
Ed Heyl [Wed, 31 Oct 2012 01:07:43 +0000 (18:07 -0700)]
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.
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 [Wed, 31 Oct 2012 00:54:24 +0000 (17:54 -0700)]
am
146378e7: am
20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
* commit '
146378e7c27f6c0a5713ccd8dbe60c9398a75f37':
QS uses nickname for multiuser and profile name for singleuser.
Amith Yamasani [Wed, 31 Oct 2012 00:51:30 +0000 (17:51 -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.
Adam Cohen [Wed, 31 Oct 2012 00:50:57 +0000 (17:50 -0700)]
Merge "Fix content alpha" into jb-mr1-lockscreen-dev
Chet Haase [Wed, 31 Oct 2012 00:49:15 +0000 (17:49 -0700)]
am
63f80350: am
27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
* commit '
63f80350dc8157cbd7ba9d7613cce5e1e88f0d87':
WindowManager shouldn't layout non-visible windows
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
Amith Yamasani [Wed, 31 Oct 2012 00:46:27 +0000 (17:46 -0700)]
am
e3d8774d: am
a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev
* commit '
e3d8774d30a8e86803e9ee6e92c435326819337a':
Don't clean up wallpaper map entry when stopping a user.
Chet Haase [Wed, 31 Oct 2012 00:45:57 +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
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.
Amith Yamasani [Wed, 31 Oct 2012 00:44:04 +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
Dirk Dougherty [Wed, 31 Oct 2012 00:12:44 +0000 (17:12 -0700)]
am
81f05833: am
05728277: am
c6df397e: am
a76f1dfc: am
c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
* commit '
81f0583340ad2e31a0c67803c3b1237f1779fc26':
Doc change: fix broken link in publishing steps TOC.
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.
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:42:33 +0000 (16:42 -0700)]
am
5b285941: am
77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
* commit '
5b285941acf39da30b45c72fb1422cb2c39295ba':
Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
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:39:53 +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:34:14 +0000 (13:34 -0700)]
am
517303e0: am
ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
* commit '
517303e05b9a9246c8aab53574d768eb52c88e7e':
DO NOT MERGE suggest LocationRequest rather than Criteria
Victoria Lease [Tue, 30 Oct 2012 20:31:44 +0000 (13:31 -0700)]
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
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:30:21 +0000 (13:30 -0700)]
am
95ba9e8b: am
8756c60c: Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev
* commit '
95ba9e8ba3a55504e3b83dbdfb3bcc23de093591':
DO NOT MERGE clarify Geofence.createCircle() param ranges
Victoria Lease [Tue, 30 Oct 2012 20:28:00 +0000 (13:28 -0700)]
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
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
OSDN Git Service
