Commit Graph

6934 Commits

Author SHA1 Message Date
Adam Cohen ee5b470b34 am b8f7475c: am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose
* commit 'b8f7475c32627a53bf23b914cd904b4f2e9dff57':
  Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
2013-10-02 06:58:15 -07:00
Adam Cohen b8f7475c32 am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose
* commit 'e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f':
  Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
2013-10-02 05:58:57 -07:00
Adam Cohen e269ca4298 Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose 2013-10-01 18:21:12 +00:00
Adam Cohen 97d5311e2a Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
Change-Id: Iba851c297ab9406b094c8f0cbf6e39675d0ffa39
2013-10-01 11:19:44 -07:00
Baligh Uddin d40b2e993f am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '4e4d65990ab6134f588330621fc594b0f33f0fb8':
  Import translations. DO NOT MERGE
2013-09-30 21:41:10 -07:00
Baligh Uddin 88b88fc5c3 Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit 2013-10-01 04:39:37 +00:00
Baligh Uddin 4e4d65990a Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic 2013-10-01 04:38:40 +00:00
Michael Jurka 090f4149cd am cc0086e4: am 1970614d: Merge "Restore parallax even if Google Now isn\'t present" into jb-ub-now-indigo-rose
* commit 'cc0086e4a4331762d81f17f7dcf6e55b4820193a':
  Restore parallax even if Google Now isn't present
2013-09-30 18:31:32 -07:00
Michael Jurka cc0086e4a4 am 1970614d: Merge "Restore parallax even if Google Now isn\'t present" into jb-ub-now-indigo-rose
* commit '1970614d0980699a6858a098dd1e13e65664ab47':
  Restore parallax even if Google Now isn't present
2013-09-30 18:29:50 -07:00
Michael Jurka 1970614d09 Merge "Restore parallax even if Google Now isn't present" into jb-ub-now-indigo-rose 2013-10-01 01:28:13 +00:00
Michael Jurka 16205da30e Restore parallax even if Google Now isn't present
- Also fix a crash when choosing third-party wallpaper pickers

Bug: 11008122

Change-Id: Ie5923fdadc1db6facf695ec05522f5e469d6c72a
2013-09-30 18:25:52 -07:00
Winson Chung e4b1fd58c3 am 5a4cb3fa: am f099eb0b: Merge "Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)" into jb-ub-now-indigo-rose
* commit '5a4cb3fa6b5794bc61a7da0990c5145e8e9e47ab':
  Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)
2013-09-30 18:19:14 -07:00
Winson Chung 5a4cb3fa6b am f099eb0b: Merge "Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)" into jb-ub-now-indigo-rose
* commit 'f099eb0bf4c0fdee5c4708d48ce0134fbf0d1249':
  Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)
2013-09-30 18:16:31 -07:00
Winson Chung f099eb0bf4 Merge "Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)" into jb-ub-now-indigo-rose 2013-10-01 01:13:23 +00:00
Winson Chung 5841efa612 Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)
Change-Id: I72feb506cbc1b03e2b99d36bc4a9d7bda27101be
2013-09-30 18:12:40 -07:00
Adam Cohen 87cbe9354c am c690dca2: am 61f560d9: Fixing AllApps pressed state (issue 10845969)
* commit 'c690dca2f741ff5f082059ed951a380525eedf57':
  Fixing AllApps pressed state (issue 10845969)
2013-09-30 16:25:29 -07:00
Adam Cohen c690dca2f7 am 61f560d9: Fixing AllApps pressed state (issue 10845969)
* commit '61f560d92ab4b11a61beeb8df97b9952027e08e4':
  Fixing AllApps pressed state (issue 10845969)
2013-09-30 16:23:27 -07:00
Adam Cohen 61f560d92a Fixing AllApps pressed state (issue 10845969)
-> Adding haptic feedback to overview mode buttons (issue 10917359)

Change-Id: Iaf7ac31521ae08f4223aa0d0ffc2f6511b85567f
2013-09-30 16:21:00 -07:00
Winson Chung bb678c73fc am c9830e5c: am f9e8640f: Merge "Disable update logic for market button." into jb-ub-now-indigo-rose
* commit 'c9830e5cb6fb6fa4f18bf40a7ec1d0573bc1e232':
  Disable update logic for market button.
2013-09-30 16:18:34 -07:00
Baligh Uddin baa5881192 am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose
* commit '751f5fdc10fae8e76dda5117f2c2eb8558ab3e34':
  Import translations. DO NOT MERGE
2013-09-30 16:18:34 -07:00
Winson Chung e1b72d61a0 am e78691ee: am 0f84a604: Ensuring that we always update the container when modifying an item in the db. (Bug 11008354)
* commit 'e78691eef11fb7d421d1ab110c29f5904cf72fe4':
  Ensuring that we always update the container when modifying an item in the db. (Bug 11008354)
2013-09-30 16:18:34 -07:00
Winson Chung c9830e5cb6 am f9e8640f: Merge "Disable update logic for market button." into jb-ub-now-indigo-rose
* commit 'f9e8640fcc02a4f1e85ff371d3938a04b24564a4':
  Disable update logic for market button.
2013-09-30 16:15:33 -07:00
Baligh Uddin 751f5fdc10 am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose
* commit 'eb0cc542fad264d53f8d31e6421aa0f8833ffd3b':
  Import translations. DO NOT MERGE
2013-09-30 16:15:32 -07:00
Winson Chung e78691eef1 am 0f84a604: Ensuring that we always update the container when modifying an item in the db. (Bug 11008354)
* commit '0f84a604563037ea65883b99d30e7ff802d986c2':
  Ensuring that we always update the container when modifying an item in the db. (Bug 11008354)
2013-09-30 16:15:32 -07:00
Winson Chung f9e8640fcc Merge "Disable update logic for market button." into jb-ub-now-indigo-rose 2013-09-30 23:05:14 +00:00
Baligh Uddin eb0cc542fa Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose 2013-09-30 22:25:51 +00:00
Baligh Uddin 6ef40c87ef Import translations. DO NOT MERGE
Change-Id: Ifeca6a682c49680a28c98bea6f859308175cdac6
Auto-generated-cl: translation import
2013-09-30 15:17:46 -07:00
Baligh Uddin ffc6d41247 Import translations. DO NOT MERGE
Change-Id: Ia13fa5fdfa7eaa3ab2188faa10e03bd095ba90c3
Auto-generated-cl: translation import
2013-09-30 15:16:17 -07:00
Baligh Uddin c83dfbea51 Import translations. DO NOT MERGE
Change-Id: I1da7185f716aefec3317251cd626b5690411e76c
Auto-generated-cl: translation import
2013-09-30 15:15:19 -07:00
Winson Chung 0f84a60456 Ensuring that we always update the container when modifying an item in the db. (Bug 11008354)
Change-Id: I82748565c878a212bdef1bffbf21f2a3fea09314
2013-09-30 14:32:58 -07:00
Adam Cohen 91e18ddec4 am a130ad32: am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose
* commit 'a130ad32c38189531e2ee7ba2813921a346118fc':
  Trying to get onShow in all the right places
2013-09-30 12:05:26 -07:00
Adam Cohen a130ad32c3 am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose
* commit 'def01fb8dc7da0d8287603ed5694ebe028640dcb':
  Trying to get onShow in all the right places
2013-09-30 12:02:47 -07:00
Adam Cohen def01fb8dc Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose 2013-09-30 19:01:10 +00:00
Winson Chung d64a66617b Disable update logic for market button.
Change-Id: Ie05995b18252cc78c38b3cb0886407b0c5a13be0
2013-09-30 11:06:59 -07:00
Adam Cohen 579a34186f am 35ef6aae: am 0655904a: Fixing regression in reordering (issue 10994971)
* commit '35ef6aae304e4b62f492a2ac7f05c986c7fe6a6b':
  Fixing regression in reordering (issue 10994971)
2013-09-29 18:37:39 -07:00
Adam Cohen 35ef6aae30 am 0655904a: Fixing regression in reordering (issue 10994971)
* commit '0655904abd2e67f3c4c5b9e8e57cee6f8f562076':
  Fixing regression in reordering (issue 10994971)
2013-09-29 18:35:10 -07:00
Adam Cohen 0655904abd Fixing regression in reordering (issue 10994971)
Change-Id: I2be98fc892c1a4392c4a5e035dd4cc1fa6fab0a9
2013-09-29 18:31:11 -07:00
Adam Cohen a8901439e7 am aaf8727e: am 2bf63d52: Fixing issue where you couldn\'t drag an item multiple pages (issue 10754544)
* commit 'aaf8727eeef17f0b758f83feb79cc861acd28798':
  Fixing issue where you couldn't drag an item multiple pages (issue 10754544)
2013-09-29 18:21:18 -07:00
Adam Cohen aaf8727eee am 2bf63d52: Fixing issue where you couldn\'t drag an item multiple pages (issue 10754544)
* commit '2bf63d520576baa433a53a77e4e24386e40c1cda':
  Fixing issue where you couldn't drag an item multiple pages (issue 10754544)
2013-09-29 18:19:47 -07:00
Adam Cohen 2bf63d5205 Fixing issue where you couldn't drag an item multiple pages (issue 10754544)
-> This was caused by a strange race condition. The page snap time was equal to
   the delay to recheck whether to snap (in DragController). This meant that
   scrollRight()/Left() would get called, and the scroller would be finished
   however, the final computeScrollHelper() hadn't been called, so the mCurrentPage
   hadn't yet been incremented.
-> Fixed the underlying race condition.
-> Added suitable gap (150 ms) between the two delays.

Change-Id: If700eb9e14d77a174e4395ca6933119bdb0da768
2013-09-29 18:13:25 -07:00
Adam Cohen cf3d8001e1 am 50a0952b: am 4ef75f52: Fixing weird paging behaviour in spring loaded mode (issue 10758454)
* commit '50a0952b65926ea84f5308d99d1620ace545d28a':
  Fixing weird paging behaviour in spring loaded mode (issue 10758454)
2013-09-29 17:00:28 -07:00
Adam Cohen 50a0952b65 am 4ef75f52: Fixing weird paging behaviour in spring loaded mode (issue 10758454)
* commit '4ef75f523c5b2bfed37bf1ed4bd2bcf8bda8b502':
  Fixing weird paging behaviour in spring loaded mode (issue 10758454)
2013-09-29 16:58:04 -07:00
Adam Cohen 4ef75f523c Fixing weird paging behaviour in spring loaded mode (issue 10758454)
Change-Id: I9d527d134a042a69a9a523bcf24d1a61f0ab0e55
2013-09-29 16:55:01 -07:00
Adam Cohen 70da394a81 am 55912cfd: am 74c5491d: Improving the granularity of reorder with resize on drop (issue 9533227)
* commit '55912cfd1811604f9d25c70af707bcda2e79d18f':
  Improving the granularity of reorder with resize on drop (issue 9533227)
2013-09-29 15:53:34 -07:00
Adam Cohen 55912cfd18 am 74c5491d: Improving the granularity of reorder with resize on drop (issue 9533227)
* commit '74c5491d1b84e072d29065748b41f0bb67459f59':
  Improving the granularity of reorder with resize on drop (issue 9533227)
2013-09-29 15:52:12 -07:00
Adam Cohen 74c5491d1b Improving the granularity of reorder with resize on drop (issue 9533227)
Change-Id: If196f75c148487a8d31f4fcdb5293cc41d3bb7a7
2013-09-29 15:50:01 -07:00
Adam Cohen 37e1ed3653 am c086bddb: am 949debe6: Fix issue where we weren\'t saving span after resize drop (issue 9533407)
* commit 'c086bddb2e75126b1eb2650ff323087f26a3c686':
  Fix issue where we weren't saving span after resize drop (issue 9533407)
2013-09-29 14:28:38 -07:00
Adam Cohen c086bddb2e am 949debe6: Fix issue where we weren\'t saving span after resize drop (issue 9533407)
* commit '949debe6e64034be1625ec21de100ea7e68545e2':
  Fix issue where we weren't saving span after resize drop (issue 9533407)
2013-09-29 14:27:02 -07:00
Adam Cohen 949debe6e6 Fix issue where we weren't saving span after resize drop (issue 9533407)
Change-Id: I760bf505ce9c894aedb6f1d0def63cdc7d39271a
2013-09-29 14:23:33 -07:00
Adam Cohen bc1f5ba29b am 1a70a512: am 82398369: Fixing NPE in onFinishBindingItems (issue 10975740)
* commit '1a70a5124fb1041e71fc631c8fab90a86daea546':
  Fixing NPE in onFinishBindingItems (issue 10975740)
2013-09-29 13:16:49 -07:00