Winson Chung
19610dbad3
am e96e5cb7: Fixing a few landscape issues.
...
* commit 'e96e5cb768fcc6f1211c8c31fa2da4dcd4e465cc':
Fixing a few landscape issues.
2011-11-28 18:05:44 -08:00
Winson Chung
8251823460
am 4a22568d: Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1
...
* commit '4a22568d492361e5118b0a01b9c4ec52017adc31':
Forcing tabs to be single line and width bound (Bug 5646142)
2011-11-28 18:05:43 -08:00
Winson Chung
301b2f42a2
am e96e5cb7: Fixing a few landscape issues.
...
* commit 'e96e5cb768fcc6f1211c8c31fa2da4dcd4e465cc':
Fixing a few landscape issues.
2011-11-28 18:05:42 -08:00
Winson Chung
4a22568d49
Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1
2011-11-28 18:04:17 -08:00
Gilles Debunne
c786952c9d
Restoring mLayout has private in TextView
...
Change-Id: I3424b2469b8b566e604247694a9bf6f4bc0e6250
2011-11-28 18:03:56 -08:00
Winson Chung
e96e5cb768
Fixing a few landscape issues.
...
- Fixing issue where widgets/icon names from side pages show in landscape (Bug 5665226)
- Fixing issue where the workspace was rendering over the hotseat in landscape (Bug 5665226)
- Fixing regression where the market button had no press feedback
Change-Id: Idcd890fdddab2d463195c9b3000fe7a0ab357200
2011-11-28 16:24:54 -08:00
Winson Chung
19cd4b9b5b
Forcing tabs to be single line and width bound (Bug 5646142)
...
Change-Id: Ia84bde47c5e4b254b636b2697c4f4889ce4f8b95
2011-11-28 13:51:05 -08:00
The Android Automerger
a09041adad
merge in ics-release history after reset to master
2011-11-28 12:25:30 -08:00
The Android Automerger
da92a12b28
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:22:59 -08:00
Michael Jurka
92f3d46cf3
Clean up unused code and import declarations
...
Change-Id: If36fd2d99a51b07290b13f697b3ea08d31feb023
2011-11-28 10:51:22 -08:00
Winson Chung
c34fa43130
am 043545a3: am 4575d201: am 8171d8ce: Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
...
* commit '043545a3c03e8d05a0fb49b1f539e77b8df0703b':
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)
2011-11-23 17:05:32 -08:00
Winson Chung
043545a3c0
am 4575d201: am 8171d8ce: Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
...
* commit '4575d2014c204d68e7afe493675e8600447d0d0e':
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)
2011-11-23 17:04:00 -08:00
Winson Chung
4575d2014c
am 8171d8ce: Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
...
* commit '8171d8ce48765cbc9e6ed96ac3dc173a8969616d':
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)
2011-11-23 17:02:22 -08:00
Winson Chung
acfb79be14
am 8171d8ce: Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
...
* commit '8171d8ce48765cbc9e6ed96ac3dc173a8969616d':
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)
2011-11-23 17:02:22 -08:00
Winson Chung
8171d8ce48
Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1
2011-11-23 17:00:17 -08:00
Winson Chung
9c96b0173e
am bb1e76be: am f52ab456: am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
...
* commit 'bb1e76bee9fa793f25f624e90ef9854146211f86':
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)
2011-11-23 15:44:26 -08:00
Winson Chung
aafa04987d
am 8f2e4b42: am ec301c29: am 97d6f9a7: Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
...
* commit '8f2e4b4225e1533d078c11e93b59b19461efeb98':
Fixing an issue where qsb press states could be out of sync. (Bug 5627327)
2011-11-23 15:44:26 -08:00
Winson Chung
bb1e76bee9
am f52ab456: am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
...
* commit 'f52ab456d2d463293074015a02e961cb76134d1d':
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)
2011-11-23 15:42:36 -08:00
Winson Chung
8f2e4b4225
am ec301c29: am 97d6f9a7: Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
...
* commit 'ec301c29e5ad0a51a9e2b53d208a9d05aa7c58ee':
Fixing an issue where qsb press states could be out of sync. (Bug 5627327)
2011-11-23 15:42:36 -08:00
Winson Chung
f52ab456d2
am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
...
* commit '65f9e9d45b8ba9aa819be2c4fca1722db7784868':
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)
2011-11-23 15:40:27 -08:00
Winson Chung
ec301c29e5
am 97d6f9a7: Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
...
* commit '97d6f9a705711870ee9a06fe4f28050228fcfb13':
Fixing an issue where qsb press states could be out of sync. (Bug 5627327)
2011-11-23 15:40:26 -08:00
Winson Chung
2bcdbf8201
am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
...
* commit '65f9e9d45b8ba9aa819be2c4fca1722db7784868':
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)
2011-11-23 15:40:16 -08:00
Winson Chung
c8d3b499ed
am 97d6f9a7: Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
...
* commit '97d6f9a705711870ee9a06fe4f28050228fcfb13':
Fixing an issue where qsb press states could be out of sync. (Bug 5627327)
2011-11-23 15:40:16 -08:00
Winson Chung
65f9e9d45b
Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1
2011-11-23 15:38:42 -08:00
Winson Chung
97d6f9a705
Merge "Fixing an issue where qsb press states could be out of sync. (Bug 5627327)" into ics-mr1
2011-11-23 15:38:34 -08:00
Adam Cohen
51eaa5bd53
am 3b77a35b: am 80d74893: am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1
...
* commit '3b77a35b1d32154f3665400407d912d5f8d656fd':
Prevent the creation of Shorcuts with null intents (issue 5629292)
2011-11-23 14:43:43 -08:00
Adam Cohen
3b77a35b1d
am 80d74893: am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1
...
* commit '80d748932ac2e6774f3e574bb4b9228b849cf6d5':
Prevent the creation of Shorcuts with null intents (issue 5629292)
2011-11-23 14:42:20 -08:00
Adam Cohen
80d748932a
am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1
...
* commit 'ea49c1c8610ad7eb0367d073a410e989c8998160':
Prevent the creation of Shorcuts with null intents (issue 5629292)
2011-11-23 14:40:18 -08:00
Adam Cohen
c6c6f32951
am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1
...
* commit 'ea49c1c8610ad7eb0367d073a410e989c8998160':
Prevent the creation of Shorcuts with null intents (issue 5629292)
2011-11-23 14:39:43 -08:00
Adam Cohen
ea49c1c861
Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1
2011-11-23 14:37:59 -08:00
Michael Jurka
e01bfc050e
am ee951cc5: am 81927a4d: am e326f186: Unload widget previews when launcher is not visible
...
* commit 'ee951cc5120c82ee2c50d63f10ba453bdbb2a41a':
Unload widget previews when launcher is not visible
2011-11-23 10:36:08 -08:00
Michael Jurka
ee951cc512
am 81927a4d: am e326f186: Unload widget previews when launcher is not visible
...
* commit '81927a4d459e01d06c880002dcec978a6e446c59':
Unload widget previews when launcher is not visible
2011-11-23 10:34:23 -08:00
Michael Jurka
8be8c43a5e
am e326f186: Unload widget previews when launcher is not visible
...
* commit 'e326f186af6b00e4ea32849f1527254c669d0600':
Unload widget previews when launcher is not visible
2011-11-22 19:47:00 -08:00
Michael Jurka
81927a4d45
am e326f186: Unload widget previews when launcher is not visible
...
* commit 'e326f186af6b00e4ea32849f1527254c669d0600':
Unload widget previews when launcher is not visible
2011-11-22 19:46:59 -08:00
Winson Chung
1120e03557
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)
...
- Also fixing regression where widget drag previews weren't slightly translucent
Change-Id: I5370819589a2fc839df8742cda5156aec986b47d
2011-11-22 17:00:50 -08:00
Michael Jurka
e326f186af
Unload widget previews when launcher is not visible
...
Can save ~1-2MB of RAM
Bug #5104303
Change-Id: I992bec33052f4d2c201e528b5edf384d05960e71
2011-11-22 17:00:06 -08:00
Adam Cohen
d919882006
Prevent the creation of Shorcuts with null intents (issue 5629292)
...
Change-Id: I54fbad2d4af27c6d8fc0d79c33e890298a3db4dc
2011-11-22 16:51:26 -08:00
Winson Chung
96ef409ebd
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)
...
- Also allowing drop on all apps button to cancel a drag
Change-Id: I27252bd34c591882d8c5f80389d8fd6f4f6e4791
2011-11-22 14:21:08 -08:00
The Android Open Source Project
a76d1f2ae5
am 64d8a4ed: Reconcile with ics-mr1-release
...
* commit '64d8a4ed00646c3e327f0a636cc295b6a02d611f':
2011-11-22 13:29:34 -08:00
The Android Open Source Project
64d8a4ed00
Reconcile with ics-mr1-release
...
Change-Id: I6b3173e0900eedd8c37be072173650ff89f41e45
2011-11-22 13:26:14 -08:00
The Android Automerger
a213be67fe
merge in ics-mr1-release history after reset to ics-mr1
2011-11-22 11:56:46 -08:00
Eric Fischer
01b21cbb88
am bdd7f592: am e7299c80: (-s ours) am 31186d05: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'bdd7f5925c565b2e7943c66172120b5da5821409':
Import revised translations. DO NOT MERGE
2011-11-21 21:12:16 -08:00
Adam Cohen
c110e2718f
am 9a03678e: am cfcc1f9d: am 07f920ed: Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1
...
* commit '9a03678e12909c663ee856976d50fd38c8ab6945':
Fix issue 5639994: disabled multi-touch on folders
2011-11-21 21:12:16 -08:00
Adam Cohen
98f737bc54
am 21291a71: am dab85aa7: am 026df005: Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1
...
* commit '21291a712821dc8d173e56d4358e68e7ce4938ea':
Fixing bug where drag would sometimes get cancelled inadvertently
2011-11-21 21:12:15 -08:00
Adam Cohen
2c03f39b08
am 84a1476e: am b7c9a026: am 049abba5: Merge "Fixing PagedView bad snap-back decisions" into ics-mr1
...
* commit '84a1476e00c3abb99f0b8efb671c8bdef985386a':
Fixing PagedView bad snap-back decisions
2011-11-21 21:12:14 -08:00
Michael Jurka
34a1ceb13b
am c9620c6b: am 3154c127: am a21e9537: Merge "Potential fix for out-of-date hardware layers" into ics-mr1
...
* commit 'c9620c6b0c75b4c508d3432a83386c711b79ec96':
Potential fix for out-of-date hardware layers
2011-11-21 21:12:14 -08:00
Eric Fischer
bdd7f5925c
am e7299c80: (-s ours) am 31186d05: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'e7299c80ad876e951c3f85d3a5475d0543f076de':
Import revised translations. DO NOT MERGE
2011-11-21 21:08:10 -08:00
Adam Cohen
9a03678e12
am cfcc1f9d: am 07f920ed: Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1
...
* commit 'cfcc1f9da71fe0503e6911d1bf910ea464886926':
Fix issue 5639994: disabled multi-touch on folders
2011-11-21 21:07:46 -08:00
Adam Cohen
21291a7128
am dab85aa7: am 026df005: Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1
...
* commit 'dab85aa7274a1aa37a3384f70780fdaa034b7ae5':
Fixing bug where drag would sometimes get cancelled inadvertently
2011-11-21 21:07:45 -08:00
Adam Cohen
84a1476e00
am b7c9a026: am 049abba5: Merge "Fixing PagedView bad snap-back decisions" into ics-mr1
...
* commit 'b7c9a026359c5d13979b461b1d941c01cc2b2466':
Fixing PagedView bad snap-back decisions
2011-11-21 21:07:40 -08:00