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
The Android Automerger
b6ce66eb67
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-31 18:34:04 -07:00
Michael Jurka
c8dc8eb327
Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
2012-10-31 17:10:11 -07:00
Xia Wang
b2a2096903
Fix WiFi stress test
...
- Disable lock screen after screen is turned on.
Without disabling lock screen, device will screen off automatically after around 10 seconds
- Add a longer timer for ping test when the data traffic is stalled.
For a short ping test, it is hard to tell whether it is a transient issue or a real issue.
bug# 7426823
Change-Id: If1a560e11dcdff519562bb2a22651d1fd523b5a2
2012-10-31 17:03:23 -07:00
Adam Powell
077105bae3
Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
2012-10-31 17:01:32 -07:00
Adam Powell
fa668cc930
Fix some drag behavior bugs in keyguard
...
Integrate from proto app
Make sure you can drag back up immediately without the delay of extra
offset on the challenge view.
There are still a few further tweaks to make here that will be
dependent on another upcoming patch.
Change-Id: I6af599e43d6be6da7b431dca5b87e39c157a54df
2012-10-31 17:01:38 -07:00
Chet Haase
f5750fbe27
am 0ed9f7d7: am 4af84142: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
...
* commit '0ed9f7d7fd449bd384bf31a36a59dd3c4d0151eb':
Fix for regression in WindowManager orientation changes
2012-10-31 16:55: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
Michael Jurka
fc753c0cf6
Use new keyguard appwidget picker
...
Also, remove ability to filter widgets by feature
in appwidget picker in anticipation of api change
Change-Id: I325de0b98f03d3a250758d504229ea27794b5330
2012-10-31 16:53:04 -07:00
Chet Haase
4f721f101d
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:45 -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
Jeff Brown
6f0888864a
am 5c43c889: am 427279fb: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
...
* commit '5c43c88945945fbf833b05d2ed851d5e43bef4b5':
Fix dream/keyguard infinite layout loop.
2012-10-31 16:50:49 -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
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
097d818ceb
am 06da2423: am 54385d91: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
...
* commit '06da2423c55bc2a61b42cdc34c0c20800fdd4977':
Fix for bug 7400445 regression in background drawable
2012-10-31 16:41:59 -07:00
Baligh Uddin
ae89c3449b
am 8994804c: am 0abea6d6: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '8994804c7d4665634c677af8425c5b6e84a0343a':
Revert "Removed symbol causing compile breakage."
2012-10-31 16:41:55 -07:00
Baligh Uddin
ed7b276937
am 2a825941: (-s ours) am ff26fc74: (-s ours) am 83e9187d: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '2a8259416fd7d0231b7e6602662319ae10dd70c4':
Revert "Import translations. DO NOT MERGE"
2012-10-31 16:41:52 -07:00
Baligh Uddin
58e0b20b9a
am 8a1faba8: (-s ours) am 94a69e34: (-s ours) am a68aa4e3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8a1faba89c58538920946950a162322e96859b2a':
Import translations. DO NOT MERGE
2012-10-31 16:41:48 -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
db636e69f1
am fce1cc9a: am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'fce1cc9a6cb0a7591bacdca2beeaf917674a4adc':
Removed symbol causing compile breakage.
2012-10-31 16:33:45 -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
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
Baligh Uddin
9f7910609f
Merge "Revert "Removed symbol causing compile breakage.""
2012-10-31 16:22:09 -07:00
Baligh Uddin
fd25e1dcab
Revert "Removed symbol causing compile breakage."
...
breaks build.
This reverts commit 48e4d2619d73f500efb90c7794d754fda91edb5c
Change-Id: Id5618ae21d55103d862f9278ae6de48ef151d272
2012-10-31 16:21:16 -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