e330432779
Import translations. DO NOT MERGE
...
Change-Id: I634bec03bc0dea7d6ce2e6d90533ab1c4ad79b7c
Auto-generated-cl: translation import
2012-10-08 11:26:31 -07:00
04220c340e
Import translations. DO NOT MERGE
...
Change-Id: Ia7f70c1a6f8a5b14d8f6bd11bece2f0010d293f7
Auto-generated-cl: translation import
2012-10-08 11:26:04 -07:00
244ebcd7b4
Bug 7301303: more rows in all apps for sw720dp-port
2012-10-08 17:19:32 +02:00
dd3a2bd40c
Fix bug 7288630: Folder icons clipped on manta
2012-10-08 16:24:46 +02:00
45355c4596
Re-merge "Add support for custom manta cling"
...
Also, fix issue where mako was crashing because
Launcher was trying to load a custom cling for it.
It was doing this because a custom home layout was
specified by SetupWizard, but for now we only want
custom clings on large devices
Bug: 7302705
Bug: 6992663
This reverts commit 2ebcf509f0
2012-10-08 15:53:53 +02:00
2214313177
Fix bug 6886990: cling accessibility
...
Clings should block interaction with elements
below when Talkback is enabled
Change-Id: Ifdcd109351fd3c2d6dc97ad75ea3ab6eea48b582
2012-10-08 15:41:51 +02:00
c1a063f33e
am 0e4803fc: am 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
...
* commit '0e4803fc9585e7a3296b9341c6557513aee3eaa4':
Revert "Add support for custom manta cling"
2012-10-07 23:41:58 -07:00
0e4803fc95
am 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
...
* commit '914d55501146cf2c3abdf52c021b40fa789d211a':
Revert "Add support for custom manta cling"
2012-10-07 23:38:33 -07:00
76b33bf8b6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 18:58:14 -07:00
914d555011
Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
2012-10-07 17:56:14 -07:00
2ebcf509f0
Revert "Add support for custom manta cling"
...
This reverts commit 68255cbabe
2012-10-08 02:38:56 +02:00
b387579e85
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 16:05:32 -07:00
90e61d1b1e
am 0870de6b: am b7fbb821: Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev
...
* commit '0870de6bac41b1bd3189f4a5734208b57545c3a1':
Genericize naming of sw720dp wallpapers
2012-10-07 14:13:33 -07:00
0870de6bac
am b7fbb821: Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev
...
* commit 'b7fbb8219b85c9e553a954cb07aa9f9cfa577fc3':
Genericize naming of sw720dp wallpapers
2012-10-07 14:11:03 -07:00
b7fbb8219b
Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev
2012-10-07 14:07:02 -07:00
8d0cd4a811
Genericize naming of sw720dp wallpapers
...
Bug: 6678111
Bug: 7032938
Change-Id: Ie9cf0f295ac090dd2692f6a1e55d4074be07508c
2012-10-07 13:12:18 -07:00
f1b371962a
am 38032f74: am 8b4d9145: Merge "Fix to ensure default widgets get size callbacks (issue 7287744)" into jb-mr1-dev
...
* commit '38032f74335ebebe7889f9f2cf90bff0ea0dd3a8':
Fix to ensure default widgets get size callbacks (issue 7287744)
2012-10-07 13:02:57 -07:00
38032f7433
am 8b4d9145: Merge "Fix to ensure default widgets get size callbacks (issue 7287744)" into jb-mr1-dev
...
* commit '8b4d91455a0fc8a632ae09138787f4c5c54c4568':
Fix to ensure default widgets get size callbacks (issue 7287744)
2012-10-07 12:59:16 -07:00
8b4d91455a
Merge "Fix to ensure default widgets get size callbacks (issue 7287744)" into jb-mr1-dev
2012-10-07 12:38:56 -07:00
8c033a1469
am 6a34c9cd: am 68255cba: Add support for custom manta cling
...
* commit '6a34c9cd590b67626b504c7893f5667fac893b27':
Add support for custom manta cling
2012-10-07 11:54:24 -07:00
6a34c9cd59
am 68255cba: Add support for custom manta cling
...
* commit '68255cbabe1cb7fbfc0706a8a2e1b1927eae1b55':
Add support for custom manta cling
2012-10-07 11:52:09 -07:00
aaa5c21ee2
Fix to ensure default widgets get size callbacks (issue 7287744)
...
Change-Id: I46b329db247a0b450493530ab619576c45418b01
2012-10-05 18:14:31 -07:00
16332c296f
am bd98fec2: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'bd98fec2ab633eb81102b3424ba258b24876e887':
2012-10-05 08:20:54 -07:00
bd98fec2ab
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ie6a1ea3624cfc602d4b3d6be7a6037255f6ef5cc
2012-10-05 08:17:48 -07:00
cfb57b89a6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 07:00:06 -07:00
68255cbabe
Add support for custom manta cling
...
- Load a custom cling if custom workspace layout is specified
- Also persist any custom workspace layout
Bug: 6992663
2012-10-05 15:36:20 +02:00
c695c28f15
am 8eaf1e82: am 28b3e10f: Removing db corruption exceptions, logging instead (issue 7112132)
...
* commit '8eaf1e82f612dc72ff7f91cdf23e4485e9efa27d':
Removing db corruption exceptions, logging instead (issue 7112132)
2012-10-04 17:56:56 -07:00
8eaf1e82f6
am 28b3e10f: Removing db corruption exceptions, logging instead (issue 7112132)
...
* commit '28b3e10fdea4d719b46d2e0da9a916bacc238fd1':
Removing db corruption exceptions, logging instead (issue 7112132)
2012-10-04 17:55:21 -07:00
28b3e10fde
Removing db corruption exceptions, logging instead (issue 7112132)
...
Change-Id: I5fd169ba53a88797723997d25399b39b0468864a
2012-10-04 17:21:33 -07:00
81cc7b0e3d
am bae5ab2b: am dd70d668: Fix for widgets with config not getting size info (issue 7266053)
...
* commit 'bae5ab2b220ea731a417ae572763883287ce3b32':
Fix for widgets with config not getting size info (issue 7266053)
2012-10-04 17:03:03 -07:00
bae5ab2b22
am dd70d668: Fix for widgets with config not getting size info (issue 7266053)
...
* commit 'dd70d66852bb8bd16f55796e546ba290360d1198':
Fix for widgets with config not getting size info (issue 7266053)
2012-10-04 17:01:33 -07:00
dd70d66852
Fix for widgets with config not getting size info (issue 7266053)
...
Change-Id: I0b55555ed38d4f2a70345d1b6316a075a9346111
2012-10-04 16:53:44 -07:00
fc9f20c425
am 917a07d8: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '917a07d8d28b20b5c3949e784e09c5c4d9f966e4':
2012-10-04 07:52:24 -07:00
917a07d8d2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I9082ae83604084d7999efcc4929bccfa34cb3765
2012-10-04 07:49:37 -07:00
fcb4538026
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-04 07:00:10 -07:00
58573b7a30
am 7610962d: am a2042d0a: Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev
...
* commit '7610962d39e36be489798ce99c3915e6224f7af4':
Specify workspace resource in preload broadcast
2012-10-03 14:53:12 -07:00
7610962d39
am a2042d0a: Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev
...
* commit 'a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773':
Specify workspace resource in preload broadcast
2012-10-03 14:51:19 -07:00
a2042d0ae9
Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev
2012-10-03 14:47:32 -07:00
7d84cc2854
Merge "Import translations. DO NOT MERGE"
2012-10-03 08:32:20 -07:00
f20399f424
am 4369a0dc: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4369a0dcc26b6298a4bba44a732b6f270a593f79':
2012-10-03 07:36:32 -07:00
4369a0dcc2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic678a9ac8903330314ffcf430137c2873a34c4ce
2012-10-03 07:35:00 -07:00
01c221b40d
am 834eb9d9: am 30e64f52: Fix size of QSB icons in landscape on sw600dp devices
...
* commit '834eb9d9f3e3830153caa193eae4009bbf691a6f':
Fix size of QSB icons in landscape on sw600dp devices
2012-10-03 07:32:11 -07:00
834eb9d9f3
am 30e64f52: Fix size of QSB icons in landscape on sw600dp devices
...
* commit '30e64f52211e7691a88eb2dcbf16ba6f1635e302':
Fix size of QSB icons in landscape on sw600dp devices
2012-10-03 07:30:53 -07:00
9f4766c9a7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 07:00:10 -07:00
30e64f5221
Fix size of QSB icons in landscape on sw600dp devices
...
Bug: 7260607
Change-Id: I8609449ed1a927a213f2f3d4f2c32c99f24f12d2
2012-10-03 14:55:35 +02:00
5524b4957f
Specify workspace resource in preload broadcast
...
Bug 7203884
Allow specifying the workspace XML layout in the PRELOAD_WORKSPACE
broadcast.
Change-Id: Iec01c6fa2dde4635f624f040b0772ee11fcd88dc
2012-10-02 16:55:54 -07:00
f1aba201af
Import translations. DO NOT MERGE
...
Change-Id: Ia3d8cd2ed0a8418aa3ef95522e8c4b65f34fd17d
Auto-generated-cl: translation import
2012-10-02 13:25:06 -07:00
a812f1677b
am f0d5149f: am daec1e8b: Fix issue where clicking home button caused search icon blip
...
* commit 'f0d5149fce0d397bf527688cc29bc994dea41a4f':
Fix issue where clicking home button caused search icon blip
2012-10-02 12:26:43 -07:00
f0d5149fce
am daec1e8b: Fix issue where clicking home button caused search icon blip
...
* commit 'daec1e8b0522e4b044d0a305a4bdef6f613779f7':
Fix issue where clicking home button caused search icon blip
2012-10-02 12:25:42 -07:00
ee0463b4fa
am a376f22c: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a376f22c700423e1143385d8e61341674fbf4c64':
2012-10-02 09:24:26 -07:00
Baligh Uddin
Michael Jurka
The Android Automerger
Jason Chen
Adam Cohen
The Android Open Source Project
Brian Muramatsu