Commit Graph

49925 Commits

Author SHA1 Message Date
Winson Chung 53fd6d1025 am 450013a9: am 0e980e4f: am e01af631: Hiding delete for AppsCustomize widgets. (Bug 10884035)
* commit '450013a90b46abc4cb5819b0659de9fad81968f8':
2014-02-14 20:35:12 +00:00
Michael Jurka d6ff815f75 am 216a9b17: am 03337715: am 1b495f52: Merge "Add default wallpaper to picker" into jb-ub-now-indigo-rose
* commit '216a9b17f11dd781b70917e289cae1b3e13958ae':
2014-02-14 20:35:11 +00:00
Anton Hansson 126e7a5fe9 am 268ca730: am c7bceb06: am a2f665f4: Broadcast app launches from all apps too.
* commit '268ca730ddabef30e9831bad401c6b58bf20f46a':
2014-02-14 20:35:10 +00:00
Baligh Uddin 192725b005 am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose
* commit '20985b6edc4dcacbf2be39e5619f281577e769d1':
2014-02-14 20:35:09 +00:00
Baligh Uddin 86759f2d41 am 0ed8331d: (-s ours) am 4c38d175: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '0ed8331d3ee603e89fed2f3064cb3e5f3f9bcbf0':
  Import translations. DO NOT MERGE
2014-02-14 20:35:08 +00:00
Baligh Uddin ecad1b10a7 am a5b43767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit 'a5b43767c61f1df15e80b43f2d961880647a2a97':
  Import translations. DO NOT MERGE
2014-02-14 20:35:07 +00:00
Chris Wren 6d0dde01f3 use restored icon for restored app shortcuts
Bug: 10778992
Change-Id: Ie430a6587d49dc0d78b87b81582c0cef7c281017
2014-02-14 11:49:30 -05:00
Sandeep Siddhartha 92ecd2346b Merge "Refactor clicks and remove dead code" into ub-now-mister-ugly 2014-02-14 03:34:49 +00:00
Sandeep Siddhartha a942030eb6 Refactor clicks and remove dead code
Change-Id: Id92f43b4f6b31707a18035dace6ad14ab728d0bb
2014-02-13 17:37:15 -08:00
Jorim Jaggi 044b67afdd am 55bd9725: Implement spring-loading of folders when dragging over.
* commit '55bd9725d5c0373b89f7b9bbd9547550ea3bbc63':
  Implement spring-loading of folders when dragging over.
2014-02-13 13:38:43 -08:00
Jim Guggemos 9a69cbbbb3 keep history after reset to git reset to 279b0385d0 2014-02-13 14:02:00 -07:00
Yura c0bb4a19bb Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
Bug: 11578157
Change-Id: I116cef5f30e9028348cd028eaf46038d9d79bdd3
2014-02-13 19:37:32 +00:00
Jorim Jaggi 55bd9725d5 Implement spring-loading of folders when dragging over.
Bug: 8912132
Change-Id: Id81889a133e56461df2e20599c4b40020818ba18
2014-02-12 22:16:51 +01:00
Baligh Uddin aff19070ac am f180497b: (-s ours) am 57251be2: (-s ours) Import translations. DO NOT MERGE
* commit 'f180497bc303af666d2672fc268730f4ec1c771b':
  Import translations. DO NOT MERGE
2014-02-11 13:32:19 -08:00
Baligh Uddin 900de8e882 am 17d9bf66: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
* commit '17d9bf66dc81e26bc4cd79a52519adf7ed63a276':
  Import translations. DO NOT MERGE
2014-02-11 13:29:04 -08:00
Baligh Uddin f180497bc3 am 57251be2: (-s ours) Import translations. DO NOT MERGE
* commit '57251be2d77ad94f05c49d42d682ec008a6e211d':
  Import translations. DO NOT MERGE
2014-02-11 13:28:18 -08:00
Baligh Uddin 15797e7f51 Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly 2014-02-11 21:26:40 +00:00
Baligh Uddin 17d9bf66dc Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 2014-02-11 21:26:32 +00:00
Yura 2239b997ee am 085c853a: Do updateWorkspaceScreenOrder inside a single transaction.
* commit '085c853a5702c45865e9b017d21fa15cf2b151b9':
  Do updateWorkspaceScreenOrder inside a single transaction.
2014-02-11 10:58:22 -08:00
Yura 085c853a57 Do updateWorkspaceScreenOrder inside a single transaction.
The workspacescreens table is updated in LauncherModel.updateWorkspaceScreenOrder
and that the operation to remove all screens, then reinsert the new list of
screens in not inside a single transaction, so if the app is updating or
crashes between ContentResolver.delete and ContentResolver.bulkInsert then
the data will be lost. This CL makes it all happen inside 1 transaction.

Bug: 12523285
Change-Id: I409dbc9f48fa9c8bd4bf3b1453204a4daac1689a
2014-02-11 15:15:29 +00:00
Anton Hansson d0642c4274 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-11 10:33:40 +00:00
Baligh Uddin 8622350606 Import translations. DO NOT MERGE
Change-Id: I51be3973bdecb0b7b29107f99ead8f6f46970e0e
Auto-generated-cl: translation import
2014-02-10 15:41:12 -08:00
Baligh Uddin 30e43d723d Import translations. DO NOT MERGE
Change-Id: Icb76bf81b4253215543f7e384efac9eb23e0c432
Auto-generated-cl: translation import
2014-02-10 15:40:51 -08:00
Baligh Uddin 57251be2d7 Import translations. DO NOT MERGE
Change-Id: Icfe6248a812a2aa103c830a9fabe22de9ff228bb
Auto-generated-cl: translation import
2014-02-10 15:39:10 -08:00
Adam Cohen 3c74c61916 am ec0d61d7: Fix NPE in when dropping from all apps (issue 12917451)
* commit 'ec0d61d79ef50010660b426b259a8ccb14656b31':
  Fix NPE in when dropping from all apps (issue 12917451)
2014-02-07 16:41:08 -08:00
Adam Cohen ec0d61d79e Fix NPE in when dropping from all apps (issue 12917451)
When dropping from all apps, accept drop was returning true if the item
was above a folder, however, when it came time to complete the drop,
the folder wouldn't accept the item. This can be prevented by increasing
the criteria in acceptDrop.

Change-Id: Ib644ec45984e8366c33bb674f3d3a76e22ed5160
2014-02-07 16:34:51 -08:00
Chris Wren a04417a07d am b6d4c282: update placeholder on package install or restore
* commit 'b6d4c2827a1514432b5eda46ff7d484d6cf244ac':
  update placeholder on package install or restore
2014-02-06 15:15:41 -08:00
Chris Wren b6d4c2827a update placeholder on package install or restore
Bug: 10778992
Change-Id: I3293d8bab8ae0ef49fc5554531bba5bd6f70932c
2014-02-06 15:05:16 -05:00
Adam Skory 853b55b96e Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-06 10:03:03 +00:00
Tom Stamm 279b0385d0 Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kr 2014-02-05 16:04:27 -07:00
Adam Cohen 25fdf7653b am c87c21a0: Merge "Small refactor to separate adding workspace / all apps items" into ub-now-lunchbox
* commit 'c87c21a0cd168c65c70b59ad12502a2e1a00b9c4':
  Small refactor to separate adding workspace / all apps items
2014-02-05 14:28:22 -08:00
Adam Cohen c87c21a0cd Merge "Small refactor to separate adding workspace / all apps items" into ub-now-lunchbox 2014-02-05 22:25:41 +00:00
Winson Chung 590c5660e1 am cb2de6f8: am 6033ceb4: Ensure we don\'t call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
* commit 'cb2de6f8a027f43bf40f3f05664bc99bd78b2b00':
  Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
2014-02-05 14:03:07 -08:00
Winson Chung cb2de6f8a0 am 6033ceb4: Ensure we don\'t call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
* commit '6033ceb438d2d8e6c8406e2b61ae515e6156965c':
  Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
2014-02-05 13:59:48 -08:00
Adam Cohen 76a47a1b22 Small refactor to separate adding workspace / all apps items
Change-Id: I06b7bc7f7f0e01696cb9670b8385e5148593e3e0
2014-02-05 13:05:02 -08:00
Winson Chung 6033ceb438 Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
Change-Id: I25115b9529c21d3079f50bc26bad8f846a6fcd3e
2014-02-05 20:39:15 +00:00
Mac Duy Hai 06e2c385e4 am 22dc65e7: Fix deprecated EMPTY_ARRAY usage (nanoprotos).
* commit '22dc65e741139936343bc792900b2e2e25378793':
  Fix deprecated EMPTY_ARRAY usage (nanoprotos).
2014-02-05 03:02:30 -08:00
Mac Duy Hai 22dc65e741 Fix deprecated EMPTY_ARRAY usage (nanoprotos).
Newer nanoproto compiler discourages the use of this.

Change-Id: Ic27a6d15f2892bb49df3100147c086a2bce20fd4
2014-02-05 10:52:07 +00:00
Adam Skory 9e3ebf3c95 Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-02-04 19:32:38 +00:00
Yura f7bc687e6e am 4f93ec63: Do not show overview when menu pressed on CustomContent screen.
* commit '4f93ec63b13f660fab63745d7127308954d5a6bd':
  Do not show overview when menu pressed on CustomContent screen.
2014-02-04 08:36:58 -08:00
Yura 4f93ec63b1 Do not show overview when menu pressed on CustomContent screen.
Bug: 12524591
Change-Id: I2bc0c4d206214d994c9a9e1bd13b42f2e53dba9f
2014-02-04 16:30:23 +00:00
Yura eb1658bc8c am fc244056: Merge "Missing paddingRight added." into ub-now-lunchbox
* commit 'fc2440566abaa5768e877138c07c1187243420b2':
  Missing paddingRight added.
2014-02-04 08:02:43 -08:00
Yura fc2440566a Merge "Missing paddingRight added." into ub-now-lunchbox 2014-02-04 16:00:31 +00:00
Adam Skory 381fa3fb2d Merge remote-tracking branch 'goog/ub-now-lunchbox' into release 2014-02-04 15:53:42 +00:00
Yura 1c8cb6fa77 Missing paddingRight added.
Bug: 8166178
Change-Id: Ie2ba02a1ad85d29f1028fe021ade37975b453305
2014-02-04 15:36:35 +00:00
Geoff Mendal 022025a9a1 am e68504f4: (-s ours) Import translations. DO NOT MERGE
* commit 'e68504f4a11296197c11b35aad71346b24af11be':
  Import translations. DO NOT MERGE
2014-02-03 18:31:25 -08:00
Geoff Mendal d48f99a8ba Import translations. DO NOT MERGE
Change-Id: I04c1a3ce4bd1f77e255f2388fa481d3541c2a3b5
Auto-generated-cl: translation import
2014-02-03 16:51:14 -08:00
Geoff Mendal e68504f4a1 Import translations. DO NOT MERGE
Change-Id: Ieaf2484f1b08841a5fecd5050c4df75125e1cecf
Auto-generated-cl: translation import
2014-02-03 16:50:19 -08:00
Adam Skory 8fa85d2025 Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release 2014-02-03 15:24:53 +00:00
Baligh Uddin e3752df785 am d25f91b0: (-s ours) am f47cc890: (-s ours) Import translations. DO NOT MERGE
* commit 'd25f91b036a76a19dfd10dfe88318a61157b7b9e':
  Import translations. DO NOT MERGE
2014-01-31 16:29:28 -08:00