Jeff Brown
ba16031aa1
am 409c89c3: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
...
* commit '409c89c35838a0a5402abb253dc24ea959db6c5e':
2012-10-31 19:37:32 -07:00
Raph Levien
19d7cc3814
am 688d0381: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
...
* commit '688d038173a40f68ec2d06183978e4aaddbb9806':
2012-10-31 19:37:28 -07:00
Baligh Uddin
28ce2ed9ba
am 4bce83ee: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '4bce83ee052b21df275822d11b07fb1fdf214cc9':
2012-10-31 19:37:24 -07:00
Baligh Uddin
7960244c49
am 13d02d04: am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '13d02d042737dd13d858151d1e28090e90ebb4a2':
2012-10-31 19:37:21 -07:00
Baligh Uddin
7a7671807c
am 47f52d75: am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '47f52d754a738d0231312bafe8eaa0da8d0b3cde':
2012-10-31 19:37:17 -07:00
Baligh Uddin
f97b62bd18
am 6697c682: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit '6697c682faf1d1b6eb2cde289ff4ac42eac04665':
2012-10-31 19:37:14 -07:00
Svetoslav Ganov
0c77753749
am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
...
* commit 'cdb80888b7c0c987223011fc4a358b458decf567':
Fix keypad accessibility.
2012-10-31 19:37:10 -07:00
Baligh Uddin
22815f1df6
am 0e06223c: am 6bd881bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0e06223ca39f12939283e68a8d7a9d8f0d33cd8c':
2012-10-31 19:37:07 -07:00
Svetoslav Ganov
708d8db946
am 51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev
...
* commit '51cfc540b578e1e6389471b28c9787ae50910655':
Accessibility of the lock screen - strings
2012-10-31 19:37:03 -07:00
Amith Yamasani
53bcda4f57
am 7f5bade1: am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
...
* commit '7f5bade1110bc45cebaf49b4e5426c8459c0666a':
2012-10-31 19:37:00 -07:00
Jim Miller
57dcf248d6
am 170c8d93: Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
...
* commit '170c8d930e7ca0c913d1e1b1e16f9ac03f323a6d':
Remove extra KeyguardViewStateManager construction
2012-10-31 19:36:51 -07:00
Chris Wren
5bbf7ef83d
am f778bfdf: Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
...
* commit 'f778bfdfa7f2022599b819ba6075e2e9e4d46329':
Update bouncer behavior on tablets.
2012-10-31 19:36:47 -07:00
Baligh Uddin
971c086ea5
am 5b039844: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
...
* commit '5b0398448b367f36883dd6c9ea16ced781c72d10':
Revert "Import translations. DO NOT MERGE"
2012-10-31 19:36:41 -07:00
Baligh Uddin
f6afd13476
am e8b0c0e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'e8b0c0e702cd962bd670450ee1c56e79a5cf8a51':
Import translations. DO NOT MERGE
2012-10-31 19:36:37 -07:00
Baligh Uddin
bdb644994d
am 02dfd644: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '02dfd644c9e0c48ecd3a3eba16cee39045fbc875':
Import translations. DO NOT MERGE
2012-10-31 19:36:33 -07:00
Dave Burke
1460a37824
am 1b33342b: am 86e1b966: Fix ordering bug
...
* commit '1b33342b0099f285e7465cd7947d55d1c09c7e37':
2012-10-31 19:36:30 -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
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
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
409c89c358
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:01 -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
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
688d038173
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:27:48 -07:00
Baligh Uddin
4bce83ee05
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:27:45 -07:00
Baligh Uddin
13d02d0427
am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '83e9187d158b891459afc182c675dca56c7dcd93':
Revert "Import translations. DO NOT MERGE"
2012-10-31 16:27:40 -07:00
Baligh Uddin
47f52d754a
am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a68aa4e34357eccd7af4d7e29e574b6bc9c61d66':
Import translations. DO NOT MERGE
2012-10-31 16:27:36 -07:00
Baligh Uddin
6697c682fa
am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'dd73325106c4d52c734647d65530e46eb70f4749':
Removed symbol causing compile breakage.
2012-10-31 16:27:32 -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
Svetoslav Ganov
cdb80888b7
Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
2012-10-31 15:06:32 -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