ba8fee769d
am 7d00b2fe: am 1e533d01: Merge "Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)" into jb-mr1-dev
...
* commit '7d00b2fe1c8ca38531e64bc1e6f678581403d524':
Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)
2012-08-28 13:02:47 -07:00
7d00b2fe1c
am 1e533d01: Merge "Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)" into jb-mr1-dev
...
* commit '1e533d01d52076c33414419930598c1d03f1b4a6':
Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)
2012-08-28 12:47:43 -07:00
1e533d01d5
Merge "Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)" into jb-mr1-dev
2012-08-28 12:45:56 -07:00
0dcaa6f710
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:34:21 -07:00
81b5225279
Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)
...
Change-Id: I677242c0952d6385ca229ba300fdd5a2a7908a8a
2012-08-27 17:42:09 -07:00
3dcc99c3d5
am c1d2a896: am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev
...
* commit 'c1d2a896a72ab7a0636abafdaf45c6f524730d7c':
Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)
2012-08-27 17:32:07 -07:00
c1d2a896a7
am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev
...
* commit '13bdaf7c9d3e4539e2db5d9f4c2bb4d8b7a8dd79':
Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)
2012-08-27 17:29:38 -07:00
13bdaf7c9d
Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev
2012-08-27 17:27:11 -07:00
aaef6b71e6
am 96e18052: am 2b3396f9: Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
...
* commit '96e180528b1084b5c3c6bbc284f8c218f071c37d':
Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)
2012-08-27 15:29:45 -07:00
96e180528b
am 2b3396f9: Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
...
* commit '2b3396f9c0e88d1633e16483322d2c52cfc271f3':
Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)
2012-08-27 15:26:44 -07:00
2b3396f9c0
Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
2012-08-27 15:23:42 -07:00
e0489500d2
Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)
...
Change-Id: Iaaeb37f630a71f8fd54a6064602ddd10d4d4ab91
2012-08-27 15:19:51 -07:00
d16b12cb70
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:34:42 -07:00
8893ca6106
am dc23178b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'dc23178be51dc97c05eab0504a91d0c0beb75806':
Temporary fix for qsb and hotseat clicking issues
2012-08-25 07:21:31 -07:00
dc23178be5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I7e42d7117f567e0dc45c8c1f4a3dc73a8704de19
2012-08-25 07:17:16 -07:00
ae5d1c39dd
am 23282720: am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
...
* commit '23282720dd7972dfc528c9d55aac069acca91082':
Adding the ability to scale the hotseat or items in the hotseat
2012-08-24 14:19:17 -07:00
23282720dd
am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
...
* commit '1dc3b9abd5ab0a39bab7694669d6784b89d362ef':
Adding the ability to scale the hotseat or items in the hotseat
2012-08-24 13:07:52 -07:00
1dc3b9abd5
Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
2012-08-24 13:05:26 -07:00
edcf9b7cdc
Merge "Updating dialtacts to new package."
2012-08-24 10:23:15 -07:00
adf0c180c1
Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)
...
Change-Id: I93baa00331bcbcd07e8702d5ad77c8f2022a16f2
2012-08-23 14:59:48 -07:00
7281b79c7f
Temporary fix for qsb and hotseat clicking issues
...
Change-Id: I3fca1e3dada12c8655887c3d7a2200b6fcfac19c
2012-08-23 14:20:10 -07:00
6e92e02826
am 039352ab: am 05ee3cff: Merge "Fixing hotseat gradient and removing landscape cling with new xlarge layout." into jb-mr1-dev
...
* commit '039352ab5893b572b91418c1b6a50b64a48dc8f0':
Fixing hotseat gradient and removing landscape cling with new xlarge layout.
2012-08-23 13:40:15 -07:00
039352ab58
am 05ee3cff: Merge "Fixing hotseat gradient and removing landscape cling with new xlarge layout." into jb-mr1-dev
...
* commit '05ee3cfffe4e5cf752e6072bcd2819faac121617':
Fixing hotseat gradient and removing landscape cling with new xlarge layout.
2012-08-23 13:37:13 -07:00
05ee3cfffe
Merge "Fixing hotseat gradient and removing landscape cling with new xlarge layout." into jb-mr1-dev
2012-08-23 13:36:20 -07:00
8d624f6870
am 06121cd4: am e29c55ac: Temporary fix for qsb and hotseat clicking issues
...
* commit '06121cd4ae031877753caaf27e90e90691939661':
Temporary fix for qsb and hotseat clicking issues
2012-08-23 12:27:13 -07:00
06121cd4ae
am e29c55ac: Temporary fix for qsb and hotseat clicking issues
...
* commit 'e29c55ac322f3386327fa5b61e79b00ba3e5d428':
Temporary fix for qsb and hotseat clicking issues
2012-08-23 12:25:46 -07:00
e29c55ac32
Temporary fix for qsb and hotseat clicking issues
...
Change-Id: I3fca1e3dada12c8655887c3d7a2200b6fcfac19c
2012-08-23 12:23:26 -07:00
74ba65b593
Fixing hotseat gradient and removing landscape cling with new xlarge layout.
...
Change-Id: I30f5672fc32c80c247be03efb557ace4654312bb
2012-08-23 12:00:25 -07:00
67b5d752fc
am 4767d66d: am fa63e438: Fixing inability to click hotseat on 720dp devices
...
* commit '4767d66d30eae31922cb86fafc5bc8c1b37fc038':
Fixing inability to click hotseat on 720dp devices
2012-08-22 13:59:18 -07:00
4767d66d30
am fa63e438: Fixing inability to click hotseat on 720dp devices
...
* commit 'fa63e43890505fed44a0d99c0bed9b68c47d6eaa':
Fixing inability to click hotseat on 720dp devices
2012-08-22 13:57:52 -07:00
fa63e43890
Fixing inability to click hotseat on 720dp devices
...
Change-Id: I4d5e81dcb3f85fa83a3b6aac1ed7bd0dba76a0c8
2012-08-22 13:52:14 -07:00
f043f804ff
Updating dialtacts to new package.
...
Bug: 6993891
Change-Id: Ibe0ba3b09b5aaa607e36e601e32572b6f0a94b89
2012-08-21 13:35:10 -07:00
8d92bfed13
am b91a9b26: am 25736aa9: Fix issue where you couldn\'t click anything in the hotseat
...
* commit 'b91a9b26f22a9cb004157bc9c018ac03c55bed37':
Fix issue where you couldn't click anything in the hotseat
2012-08-20 22:51:20 -07:00
b91a9b26f2
am 25736aa9: Fix issue where you couldn\'t click anything in the hotseat
...
* commit '25736aa94cc23a2313c336b663da728bbdae32b2':
Fix issue where you couldn't click anything in the hotseat
2012-08-20 22:49:31 -07:00
25736aa94c
Fix issue where you couldn't click anything in the hotseat
...
Change-Id: I48aaa63d2a439cee9a2bfd4888cafe13498d88c8
2012-08-20 22:43:25 -07:00
307fe23f12
Adding the ability to scale the hotseat or items in the hotseat
...
--> A bunch of stuff breaks when scaling the hotseat. More specifically,
drag and drop animations between hotseat and workspace,
scaling on pick up, folder animations, determination of
item placement. This CL fixes these issues so that the
hotseat or hotseat items are ready to be scaled.
--> For now, using 90% scale factor for 7-inch+ UIs
Change-Id: Iac098409347e76139e4d726a071397b56ac684d2
2012-08-20 21:49:43 -07:00
9d3bdf1b50
am e0d0b18d: am 8e56a75d: Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev
...
* commit 'e0d0b18de077233908da128d61c2b020f9ff527a':
Cleaning up folders for 7-inch and 10-inch UIs
2012-08-16 16:42:42 -07:00
e0d0b18de0
am 8e56a75d: Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev
...
* commit '8e56a75db48d8d62d7defbb64d91e03d430ae67c':
Cleaning up folders for 7-inch and 10-inch UIs
2012-08-16 16:41:31 -07:00
8e56a75db4
Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev
2012-08-16 16:39:56 -07:00
4d46224437
am ab864720: am ddfe9821: Remove unused import
...
* commit 'ab864720166bfe1bfa13505ac6e3ce43a0e4ea90':
Remove unused import
2012-08-16 14:24:00 -07:00
ab86472016
am ddfe9821: Remove unused import
...
* commit 'ddfe982177ecc03469d3b7f43d639b8e2967eebe':
Remove unused import
2012-08-16 14:21:32 -07:00
5eee8e4cee
Import translations. DO NOT MERGE
...
Change-Id: I1d357a84b3ae26d7999900ef910e8d7480071f03
Auto-generated-cl: translation import
2012-08-16 11:54:40 -07:00
ddfe982177
Remove unused import
...
Change-Id: I2eaf2b33e3b61fed86a468fbd221fd12191a396f
2012-08-15 22:48:01 -07:00
985b9b6406
Cleaning up folders for 7-inch and 10-inch UIs
...
Change-Id: I44c068ea288e4683aa7dc9e86bdac6226bb42b75
2012-08-15 15:37:27 -07:00
260b65b58a
am d634dee1: am 5c768e2f: Removing debugging background.
...
* commit 'd634dee10dd779af6aa213f3b6c255a52f10bf01':
Removing debugging background.
2012-08-09 10:51:29 -07:00
d634dee10d
am 5c768e2f: Removing debugging background.
...
* commit '5c768e2fac95f8b8b2d6b5c523d7e1cdc968e395':
Removing debugging background.
2012-08-09 10:50:24 -07:00
5c768e2fac
Removing debugging background.
...
Change-Id: I2273e126a3005b253f5bab459e5d1574c315ece0
2012-08-09 10:43:34 -07:00
1c6717ba40
am f2d3248c: am 2a6d78ef: Merge "Initial changes for new 10inch layout." into jb-mr1-dev
...
* commit 'f2d3248c305f2147925cd01674a81d9f9b60e4d7':
Initial changes for new 10inch layout.
2012-08-08 15:11:49 -07:00
d1594d5f01
am 7ba833ea: am 33650301: Set permission [UN]INSTALL_SHORTCUT protectionLevel to \'dangerous\'
...
* commit '7ba833ea7f053b1073bce618a864bdd0a7e6ebe5':
Set permission [UN]INSTALL_SHORTCUT protectionLevel to 'dangerous'
2012-08-08 15:11:18 -07:00
f2d3248c30
am 2a6d78ef: Merge "Initial changes for new 10inch layout." into jb-mr1-dev
...
* commit '2a6d78ef453f48d093bf2e22e90fe99b15aba97e':
Initial changes for new 10inch layout.
2012-08-08 14:26:56 -07:00
Winson Chung
The Android Automerger
Adam Cohen
The Android Open Source Project
Chiao Cheng
Michael Jurka
Baligh Uddin
Nick Kralevich