Raph Levien
54385d91f0
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
2012-10-31 16:28:08 -07:00
Baligh Uddin
0abea6d6e7
am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '9e3a900c35d6af749d0c363dadf627384eed687a':
Revert "Removed symbol causing compile breakage."
2012-10-31 16:28:05 -07:00
Baligh Uddin
ff26fc74fe
am 83e9187d: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '83e9187d158b891459afc182c675dca56c7dcd93':
Revert "Import translations. DO NOT MERGE"
2012-10-31 16:28:00 -07:00
Baligh Uddin
94a69e3458
am a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a68aa4e34357eccd7af4d7e29e574b6bc9c61d66':
Import translations. DO NOT MERGE
2012-10-31 16:27:56 -07:00
Baligh Uddin
f3820b139e
am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'dd73325106c4d52c734647d65530e46eb70f4749':
Removed symbol causing compile breakage.
2012-10-31 16:27:53 -07:00
Raph Levien
c01d1045ef
Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
2012-10-31 16:18:46 -07:00
Baligh Uddin
9e3a900c35
Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
2012-10-31 16:18:13 -07:00
Baligh Uddin
2a2734f242
Revert "Removed symbol causing compile breakage."
...
breaks build.
This reverts commit d8a5792ae760a22aed4aa4ffd2caa5161d61baad
Change-Id: Ib92e9eee7f581bd9c508a735ef8a770316565d25
2012-10-31 16:16:22 -07:00
Baligh Uddin
83e9187d15
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
2012-10-31 16:14:44 -07:00
Baligh Uddin
1fefef1cb3
Revert "Import translations. DO NOT MERGE"
...
breaks build.
This reverts commit a7cd483e4d7f097487ca9babc27316c11f2e4afb
Change-Id: I5690d3c9048f70b33a3e9610b821873a335a8357
2012-10-31 16:13:57 -07:00
Baligh Uddin
a68aa4e343
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-31 15:31:34 -07:00
Baligh Uddin
dd73325106
Merge "Removed symbol causing compile breakage." into jb-mr1-dev
2012-10-31 15:28:44 -07:00
Baligh Uddin
d8a5792ae7
Removed symbol causing compile breakage.
...
Seems like this string was removed in
https://googleplex-android-review.googlesource.com/#/c/247477
Change-Id: I2cc96143980d326cfdbc1db3b2a3c9766963ef03
2012-10-31 15:05:47 -07:00
Baligh Uddin
63f43d5619
am 6bd881bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6bd881bd328835f9b042d859cb496ed6f612c17b':
Import translations. DO NOT MERGE
2012-10-31 15:05:02 -07:00
Baligh Uddin
6bd881bd32
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-31 15:02:31 -07:00
Raph Levien
39824f685c
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
2012-10-31 13:59:02 -07:00
Amith Yamasani
47ece2e53e
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
2012-10-31 13:09:42 -07:00
Amith Yamasani
03f7ebfeaa
Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
2012-10-31 13:06:56 -07:00
Baligh Uddin
53b029b620
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
2012-10-31 10:37:14 -07:00
Baligh Uddin
c061cef351
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
2012-10-31 10:35:37 -07:00
Baligh Uddin
74db3bb81b
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-31 10:20:16 -07:00
Baligh Uddin
8339bf19ec
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-31 10:11:17 -07:00
Dave Burke
ee6e335448
am 86e1b966: Fix ordering bug
...
* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
Fix ordering bug
2012-10-30 21:51:08 -07:00
Dave Burke
86e1b96666
Fix ordering bug
...
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:45:12 -07:00
Baligh Uddin
7fc99e8911
Import translations. DO NOT MERGE
...
Change-Id: I01d1dafe9b0dc9d6fb4d90ff97fc39cbeca4f3f8
Auto-generated-cl: translation import
2012-10-30 19:34:07 -07:00
Baligh Uddin
d66c41c56b
Import translations. DO NOT MERGE
...
Change-Id: I6df01942373d95ef42198afb69cf892fbdbec798
Auto-generated-cl: translation import
2012-10-30 19:32:59 -07:00
Baligh Uddin
a7cd483e4d
Import translations. DO NOT MERGE
...
Change-Id: I359781293df3f79daa98691719636baac0f93afb
Auto-generated-cl: translation import
2012-10-30 19:10:48 -07:00
Baligh Uddin
9ab7f479f9
Import translations. DO NOT MERGE
...
Change-Id: I5a6cc89a0cdc7d6fa5be47c926e69555db4e9ba9
Auto-generated-cl: translation import
2012-10-30 19:08:26 -07:00
Svetoslav Ganov
1728e5509e
am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
Fixing view accessibility classification for recents.
2012-10-30 18:33:29 -07:00
Svetoslav Ganov
0bd6f96ff0
Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
2012-10-30 18:30:45 -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
Ed Heyl
5c12bc5851
Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev
2012-10-30 18:04:31 -07:00
Amith Yamasani
146378e7c2
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.
2012-10-30 17:51:30 -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
63f80350dc
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:57 -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
Amith Yamasani
e3d8774d30
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:04 -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
81f0583340
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
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
Casey Burkhardt
c7c972d832
Fixing view accessibility classification for recents.
...
Change-Id: I0324fe322d97ee35105d7d71442fa79663e0fdfa
Bug: 7438790
2012-10-30 17:09:28 -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