Michael Jurka
3bf0359f28
am a113121f: Stop using mcc for custom workspace cling on sw600dp devices
...
* commit 'a113121fd3c43f1e1d23064e17c540c48fe330cc':
Stop using mcc for custom workspace cling on sw600dp devices
2012-10-09 17:14:50 -07:00
Winson Chung
2db90f32a1
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
...
Change-Id: I96514f762a1af1ec66523afde7db7a967b625afb
2012-10-09 15:05:08 -07:00
The Android Open Source Project
525568f463
am 7bd31959: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '7bd31959b18aa609a2272dfb3e6678f43a90a661':
2012-10-09 07:35:41 -07:00
The Android Open Source Project
7bd31959b1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I76401e4d503b987805ad009441310290bef71483
2012-10-09 07:30:27 -07:00
The Android Automerger
37f93295e1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:47 -07:00
Michael Jurka
a113121fd3
Stop using mcc for custom workspace cling on sw600dp devices
...
Bug: 7203884
2012-10-09 14:46:26 +02:00
Michael Jurka
8c063cfcff
am 82c0fe72: am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
...
* commit '82c0fe723c1542023fe0e61bc628b8a729be1692':
Re-merge "Add support for custom manta cling"
2012-10-08 13:36:41 -07:00
Michael Jurka
82c0fe723c
am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
...
* commit '75f63ee49e64abe407ac123068c6e271331e9aee':
Re-merge "Add support for custom manta cling"
2012-10-08 13:33:47 -07:00
Michael Jurka
a3148b72fe
am a64478fd: am 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
...
* commit 'a64478fdc28996f6145c992358f90ca66775266e':
Fix bug 6886990: cling accessibility
2012-10-08 13:33:44 -07:00
Michael Jurka
a64478fdc2
am 570caf27: am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
...
* commit '570caf27d97de328e8c500bb96f917760bdc12dc':
Fix bug 6886990: cling accessibility
2012-10-08 13:32:20 -07:00
Michael Jurka
75f63ee49e
am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
...
* commit '98d7bd72df9833b0149dd4772cce710fa4b7476d':
Re-merge "Add support for custom manta cling"
2012-10-08 13:31:21 -07:00
Michael Jurka
89b2b21425
am e027023e: am 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
...
* commit 'e027023eb2c384b77c124d55fdc1711035d52781':
Fix bug 7288630: Folder icons clipped on manta
2012-10-08 13:30:12 -07:00
Michael Jurka
570caf27d9
am 6c5679e5: Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
...
* commit '6c5679e5ddbac06d555f1242a2cf082deb71de21':
Fix bug 6886990: cling accessibility
2012-10-08 13:29:56 -07:00
Michael Jurka
98d7bd72df
Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
2012-10-08 13:29:25 -07:00
Michael Jurka
6c5679e5dd
Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
2012-10-08 13:28:38 -07:00
Michael Jurka
e027023eb2
am 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
...
* commit '67c251bb26c7f1cdb89550ad805c4e521315e2a8':
Fix bug 7288630: Folder icons clipped on manta
2012-10-08 13:27:50 -07:00
Michael Jurka
1d1b00ec0c
am f4b2836d: am 953ce06f: am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
...
* commit 'f4b2836d6c500a229dd7097c878b251b205d980b':
Bug 7301303: more rows in all apps for sw720dp-port
2012-10-08 13:26:16 -07:00
Michael Jurka
67c251bb26
am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
...
* commit 'ec437d0e7e95420213abcebcb832eb10e8196a20':
Fix bug 7288630: Folder icons clipped on manta
2012-10-08 13:25:24 -07:00
Michael Jurka
f4b2836d6c
am 953ce06f: am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
...
* commit '953ce06f73e19ba4fa4c67dbaf741385ec170ba3':
Bug 7301303: more rows in all apps for sw720dp-port
2012-10-08 13:23:54 -07:00
Michael Jurka
ec437d0e7e
Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
2012-10-08 13:23:24 -07:00
Michael Jurka
953ce06f73
am dad6ca7b: Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
...
* commit 'dad6ca7b1417984c579eadc50f3a1d9a948042fe':
Bug 7301303: more rows in all apps for sw720dp-port
2012-10-08 13:22:34 -07:00
Michael Jurka
dad6ca7b14
Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
2012-10-08 13:21:19 -07:00
Baligh Uddin
494e264540
am 38223400: (-s ours) am e33f6d36: am e3304327: Import translations. DO NOT MERGE
...
* commit '3822340051647969fb4bdc814782622d1d593adf':
Import translations. DO NOT MERGE
2012-10-08 13:04:35 -07:00
Baligh Uddin
e0d3fe3047
am 21fd4ab9: (-s ours) am 04220c34: Import translations. DO NOT MERGE
...
* commit '21fd4ab93f1959ad5e2eb1d609d3ccc491615d15':
Import translations. DO NOT MERGE
2012-10-08 13:03:04 -07:00
Baligh Uddin
3822340051
am e33f6d36: am e3304327: Import translations. DO NOT MERGE
...
* commit 'e33f6d36f0142050b29e2243c08b90d2d8683fb6':
Import translations. DO NOT MERGE
2012-10-08 13:02:37 -07:00
Baligh Uddin
21fd4ab93f
am 04220c34: Import translations. DO NOT MERGE
...
* commit '04220c340e6f08317795a04b9ca89458f9820f55':
Import translations. DO NOT MERGE
2012-10-08 13:01:06 -07:00
Baligh Uddin
e33f6d36f0
am e3304327: Import translations. DO NOT MERGE
...
* commit 'e330432779401d0e590b2ffd3547b2d45974e640':
Import translations. DO NOT MERGE
2012-10-08 13:00:22 -07:00
Baligh Uddin
e330432779
Import translations. DO NOT MERGE
...
Change-Id: I634bec03bc0dea7d6ce2e6d90533ab1c4ad79b7c
Auto-generated-cl: translation import
2012-10-08 11:26:31 -07:00
Baligh Uddin
04220c340e
Import translations. DO NOT MERGE
...
Change-Id: Ia7f70c1a6f8a5b14d8f6bd11bece2f0010d293f7
Auto-generated-cl: translation import
2012-10-08 11:26:04 -07:00
Michael Jurka
244ebcd7b4
Bug 7301303: more rows in all apps for sw720dp-port
2012-10-08 17:19:32 +02:00
Michael Jurka
dd3a2bd40c
Fix bug 7288630: Folder icons clipped on manta
2012-10-08 16:24:46 +02:00
Michael Jurka
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 .
Change-Id: I46533309d5c62edfbd3a3b178c6965ffc73b6476
2012-10-08 15:53:53 +02:00
Michael Jurka
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
Michael Jurka
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
Michael Jurka
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
The Android Automerger
76b33bf8b6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 18:58:14 -07:00
Michael Jurka
914d555011
Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
2012-10-07 17:56:14 -07:00
Michael Jurka
2ebcf509f0
Revert "Add support for custom manta cling"
...
This reverts commit 68255cbabe .
2012-10-08 02:38:56 +02:00
The Android Automerger
b387579e85
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 16:05:32 -07:00
Jason Chen
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
Jason Chen
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
Jason Chen
b7fbb8219b
Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev
2012-10-07 14:07:02 -07:00
Jason Chen
8d0cd4a811
Genericize naming of sw720dp wallpapers
...
Bug: 6678111
Bug: 7032938
Change-Id: Ie9cf0f295ac090dd2692f6a1e55d4074be07508c
2012-10-07 13:12:18 -07:00
Adam Cohen
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
Adam Cohen
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
Adam Cohen
8b4d91455a
Merge "Fix to ensure default widgets get size callbacks (issue 7287744)" into jb-mr1-dev
2012-10-07 12:38:56 -07:00
Michael Jurka
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
Michael Jurka
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
Adam Cohen
aaa5c21ee2
Fix to ensure default widgets get size callbacks (issue 7287744)
...
Change-Id: I46b329db247a0b450493530ab619576c45418b01
2012-10-05 18:14:31 -07:00
The Android Open Source Project
16332c296f
am bd98fec2: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'bd98fec2ab633eb81102b3424ba258b24876e887':
2012-10-05 08:20:54 -07:00