Adam Powell
055f001f76
am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
...
* commit '45d2f164877a8bfd4e99666b00d56169b23ff979':
Fix keyguard bugs
2012-10-31 19:41:55 -07:00
Michael Jurka
1ba20a670d
am 7b1deee1: am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
...
* commit '7b1deee1554ca8f4a4d6d79091eea7358a1b3bce':
Fix crash on boot
2012-10-31 19:41:51 -07:00
Jim Miller
0b063f3103
am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
...
* commit '2bf287c884f18e0f5c18c738d2d9b42d34323857':
Re-enable transition animation between face unlock and backup
2012-10-31 19:41:46 -07:00
Jim Miller
99e8692ace
am c3ab855a: am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'c3ab855a35bafcf3138316fc8d20c2a3933d40f5':
Fix potential null pointer exeption in keyguard
2012-10-31 19:41:40 -07:00
Svetoslav Ganov
412a92cfe2
am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit 'acb544dda8861b7da84c8c078d87a7a713f363a8':
Lockscreen accessibility - strings.
2012-10-31 19:41:36 -07:00
Svetoslav Ganov
3f909ed0e1
am 253cbc43: am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '253cbc43323ff52fdb731d4867b4886207d5a655':
2012-10-31 19:41:32 -07:00
Ed Heyl
770cf0023e
am aa5f5a22: am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
...
* commit 'aa5f5a22754db00be8b7d4fd7fb9c36a5ad393ed':
2012-10-31 19:41:30 -07:00
Amith Yamasani
1f3d76bdaa
am 1fa4fc55: am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
...
* commit '1fa4fc558173d2491b06eed272c8cc848d575109':
2012-10-31 19:41:26 -07:00
Amith Yamasani
87ef92bf93
am d505aa90: am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
...
* commit 'd505aa908812a8e05b12ceee63ccdf7f0957fbf9':
QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 19:41:24 -07:00
Adam Powell
45d2f16487
am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
...
* commit 'e74fcc0eb15a0ea16d55e03c80a8442e09e16aee':
Fix keyguard bugs
2012-10-31 18:38:06 -07:00
Michael Jurka
7b1deee155
am 3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
...
* commit '3c416dfcc0a4692b20a09f188284d9127dd5dbca':
Fix crash on boot
2012-10-31 18:38:03 -07:00
Jim Miller
2bf287c884
am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
...
* commit '162fc8e64be6a6c357d39d36906ac7e36f07ed33':
Re-enable transition animation between face unlock and backup
2012-10-31 18:37:59 -07:00
Jim Miller
c3ab855a35
am e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'e0ec5d428f80fe49b291a0e0edd51a4398bde609':
Fix potential null pointer exeption in keyguard
2012-10-31 18:37:55 -07:00
Svetoslav Ganov
acb544dda8
am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit '8ea7cbe6f338b3dad2817eeca437221eede4298f':
Lockscreen accessibility - strings.
2012-10-31 18:37:51 -07:00
Svetoslav Ganov
253cbc4332
am 4a85b9f3: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
...
* commit '4a85b9f36cb180453298eec7f4a55de37586907b':
2012-10-31 18:37:47 -07:00
Ed Heyl
aa5f5a2275
am 1f928787: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
...
* commit '1f928787eebefedef944708f99515fabfcc4a201':
2012-10-31 18:37:44 -07:00
Amith Yamasani
1fa4fc5581
am d2f616f2: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
...
* commit 'd2f616f224b2731778c187dba4ecfa3a1a2e7869':
2012-10-31 18:37:39 -07:00
Amith Yamasani
d505aa9088
am 7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
...
* commit '7277d5d97f2b873582dbd60a63a22da452d96ff9':
QS uses nickname for multiuser and profile name for singleuser.
2012-10-31 18:37:34 -07:00
Chet Haase
0ed9f7d7fd
am 4af84142: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
...
* commit '4af84142e08dd082ac5a0f94adb8c6df83589e2e':
Fix for regression in WindowManager orientation changes
2012-10-31 16:53:55 -07:00
Chet Haase
4af84142e0
am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
...
* commit 'fe28ff0d063818762dd585a67fcffd61cabd5a2f':
Fix for regression in WindowManager orientation changes
2012-10-31 16:51:23 -07:00
Chet Haase
fe28ff0d06
Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
2012-10-31 16:49:12 -07:00
Jeff Brown
5c43c88945
am 427279fb: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
...
* commit '427279fb4d55caf61c88d90b8f348dfc915fbe20':
Fix dream/keyguard infinite layout loop.
2012-10-31 16:48:09 -07:00
Jeff Brown
427279fb4d
am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
...
* commit 'c1c53e56fb5222bfdd17f0a9f735efe5c1b8cb70':
Fix dream/keyguard infinite layout loop.
2012-10-31 16:45:37 -07:00
Jeff Brown
c1c53e56fb
Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
2012-10-31 16:42:26 -07:00
Raph Levien
06da2423c5
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
2012-10-31 16:39:09 -07:00
Baligh Uddin
8994804c7d
am 0abea6d6: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '0abea6d6e78758e225f4e0b1fcd3b92be1c4e63b':
Revert "Removed symbol causing compile breakage."
2012-10-31 16:39:03 -07:00
Baligh Uddin
2a8259416f
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"
2012-10-31 16:39:02 -07:00
Baligh Uddin
8a1faba89c
am 94a69e34: (-s ours) am a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '94a69e34583100d993b9a74a314ee09e7db87faa':
Import translations. DO NOT MERGE
2012-10-31 16:33:35 -07:00
Baligh Uddin
fce1cc9a6c
am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'f3820b139e7a79df959c977cb83324639652c11a':
Removed symbol causing compile breakage.
2012-10-31 16:31:25 -07:00
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
Chet Haase
d5d11af3d3
Fix for regression in WindowManager orientation changes
...
A fix yesterday for #7428221 caused a regression where new orientations would
sometimes cause a flash through black on the way to seeing the real static wallpaper.
There is a fundamental problem in WindowManagerService where we show a window before
it has all of the layout/sizing information it needs, which is the cause of the black
flash. The regression yesterday was that we are now less aggressive about layout out
hidden windows, so we won't layout the window until after the window is shown with the
incorrect sizing info.
The fix/workaround is to back off the layout logic specifically for the wallpaper,
ensuring that we will lay it out on orientation changes, even when hidden. This means that
when we finally do show it, it will already have been drawn in the correct orientation/size.
Issue #7444971 Home jank regression
Change-Id: Ib20fdabc43ece9720b261bf04b272c5511e2d902
2012-10-31 15:40:54 -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
809453344c
am 63f43d56: am 6bd881bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '63f43d56198d8423f875d23e3bb2559b652d8d5a':
Import translations. DO NOT MERGE
2012-10-31 15:07:58 -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
d02f231318
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
2012-10-31 13:11:50 -07:00
Baligh Uddin
196f1408eb
am 53b029b6: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
...
* commit '53b029b6201dbe754d478f3dfcbd4f1e5ee5b41e':
Revert "Import translations. DO NOT MERGE"
2012-10-31 13:11:50 -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