Commit Graph

7950 Commits

Author SHA1 Message Date
Michael Jurka fb07a6ab67 am 69413c91: Move additional wallpaper picker files to special dir
* commit '69413c91c5839fd061f2422ea603faf11a5dd629':
  Move additional wallpaper picker files to special dir
2014-02-14 20:38:43 +00:00
Adam Cohen be71ebfb28 am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit
* commit 'f833fefb50e0eeae586cd66584b13ae299c0acea':
  Don't load items which exceed the grid bounds
2014-02-14 20:38:42 +00:00
Winson Chung cd1092ce7b am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
* commit 'b6147f85786c78b3608eabf2286cd9e61c28878d':
  Adjusting grid for tablets and fixing incorrect resources for large tablets.
2014-02-14 20:38:42 +00:00
Winson Chung d6b50a4872 am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
* commit '1239b9da8901f1384aa30f88f8b660078d37ea82':
  Fixing issue with Widget sizes being icorrectly reported.
2014-02-14 20:38:41 +00:00
Adam Cohen d039b6e254 am fe69287b: Fix new NPE relating to reorder hints
* commit 'fe69287b97d16c8941ab9463e4868fca45ad8152':
  Fix new NPE relating to reorder hints
2014-02-14 20:38:40 +00:00
Chris Wren bf597a68e9 am 52a935a2: Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
* commit '52a935a242b79a97c30852babe7396a6f7e47aa2':
  expose the protoutil for launcher as an executable script
2014-02-14 20:38:40 +00:00
Michael Jurka d2f157283c am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
* commit '772bbcc764a54ca513f946f70f249fd536ae84c3':
  Revert "Revert "Move wallpaper picker code to a separate directory""
2014-02-14 20:38:39 +00:00
Dan Sandler 5ab7187d6e am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
* commit 'a40916d534da1b3e05c905b5beb931e0140a353f':
  Size hotseat data structure appropriately.
2014-02-14 20:38:38 +00:00
Adam Cohen f2551ffcd4 am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
* commit '1f60653abcc349127014e4f32232261dfc28b309':
  Adding reorder hinting, hopefully will help with (issue 10654628)
2014-02-14 20:38:37 +00:00
Michael Jurka 0a667dd4ef am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
* commit '8824eadc960a90fe5f1dddb231e430c782d960d0':
  Revert "Move wallpaper picker code to a separate directory"
2014-02-14 20:38:36 +00:00
Derek Prothro 98245209f6 am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
* commit 'fa071f936a0cc84b0266536a74464244744ccfe9':
  Bind the workspace synchronously if started on -1 screen.
2014-02-14 20:38:36 +00:00
Michael Jurka 744cbf4623 am 8e88cb84: Move wallpaper picker code to a separate directory
* commit '8e88cb84781907afb7cca80581fea2277264fd2c':
  Move wallpaper picker code to a separate directory
2014-02-14 20:38:35 +00:00
Winson Chung 07c9ade5be am 33231f58: Fixing crash in empty folders. (Bug 11627191)
* commit '33231f587e1a6f716af68e6198df774d2847a8e5':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 20:38:34 +00:00
Winson Chung ffba2dfd7a am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
* commit 'fe2fb82657d52c17c9a09fb74e140b80db634a8c':
  Revert "Fixing crash in empty folders. (Bug 11627191)"
2014-02-14 20:38:34 +00:00
Winson Chung 6160c3947a am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
* commit 'cace67f7ddf467e649604a8b08aa582ce5c33532':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 20:38:33 +00:00
Nilesh Agrawal 0d43ba8c91 am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
* commit 'da41ea669890a79a4d2bc57dab9ae03157fd9e75':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:38:32 +00:00
Nilesh Agrawal 03ec57d313 am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
* commit '93b6ee6dfaa954747c9b107e147d57ea4866f78d':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
2014-02-14 20:38:32 +00:00
Nilesh Agrawal ac2ddbb427 am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
* commit '23c165a990a5faa11d9b63b437005cf6e3c4d83e':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:38:31 +00:00
Chris Wren 3eaaf7d1c4 am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
* commit '06a0ac2fea10bde7f5a45e72dea83308773a220d':
  backup launcher preferences
2014-02-14 20:38:30 +00:00
Adam Cohen 8aebe36dd9 am 5d518fa7: Decrease delay for closing folder on removal of an item (issue 11028310)
* commit '5d518fa77c56a65104f02f40269ad8e43f3431b2':
  Decrease delay for closing folder on removal of an item (issue 11028310)
2014-02-14 20:38:29 +00:00
Michael Jurka 29de7557c5 am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
* commit '566bdc3759584d5fedbbd82ccda1fa8d8d4441cb':
  Update suggested wallpaper dimensions in onResume
2014-02-14 20:38:29 +00:00
Winson Chung 9026ce177a am 58705534: am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf
* commit '58705534ab953c6394269da671cf60066f216815':
  Fixing regression in drop target bar height. (Bug 11980757)
2014-02-14 20:38:28 +00:00
Adam Cohen b2d3890df4 am f9cd258b: am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)
* commit 'f9cd258be2d572095d855fc5ceef330d7b022fc0':
  Fix page jumping regression in overview mode (issue 12003672)
2014-02-14 20:38:28 +00:00
Winson Chung 6b165fa8d0 am 0ea74f13: Merge "Limit AllApps insets to certain device configurations. (Bug 11451335)" into jb-ub-now-kermit
* commit '0ea74f1394f17aad700bee48b4d8d1bb4a095b4d':
  Limit AllApps insets to certain device configurations. (Bug 11451335)
2014-02-14 20:38:27 +00:00
Winson Chung 89524f48e5 am 17bde09a: Merge "Retain current AllApps page if we never leave Launcher. (Bug 11468582)" into jb-ub-now-kermit
* commit '17bde09a9e9bc4113d9763ccf827307509c04aef':
  Retain current AllApps page if we never leave Launcher. (Bug 11468582)
2014-02-14 20:38:26 +00:00
Winson Chung 88818ab2df am 42b3c068: Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
* commit '42b3c06849331aa5ba1f07f8c58915190d386aac':
  Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
2014-02-14 20:38:26 +00:00
Adam Cohen ec6b71a008 am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)
* commit '531a5c324e20b354a674851fd4808c105a80af3a':
  Add guards for restoreInstanceState (issue 11982812)
2014-02-14 20:38:25 +00:00
Dan Sandler 0572c31031 am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
* commit 'b4ee57927224429e34e3a81519b2ea658e41fc45':
  Revert "Revert "Enable Launcher2 workspace import.""
2014-02-14 20:38:24 +00:00
Adam Cohen 7cb06bde49 am 87f445c8: am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf
* commit '87f445c8b28c59e787e5fbfc7ba223e112d2263f':
  Only import workspaces for non-tablets (where grid hasn't changed)
2014-02-14 20:38:24 +00:00
Michael Jurka 512093f365 am 16fa074d: am 1c00fd0b: Fix NPE when going to All Apps in landscape
* commit '16fa074d824ed64c02e8ac3bca6cc7eaab6db509':
  Fix NPE when going to All Apps in landscape
2014-02-14 20:38:23 +00:00
Winson Chung f342c5b432 am 0c1b33db: am 2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
* commit '0c1b33dbd44d957090abe5647af7fbe1b4f5ff1a':
  Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
2014-02-14 20:38:22 +00:00
Winson Chung 1cfabb7f14 am ab84b8b4: am 1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)" into jb-ub-now-jolly-elf
* commit 'ab84b8b4efa57e658c2c43f2876968b61cbe4005':
  Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)
2014-02-14 20:38:22 +00:00
Michael Jurka 082893ffba am 3ed4a4dd: am 10a8935e: Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elf
* commit '3ed4a4dd3dc77295579e8eaece294c30cf6831ef':
  Use AsyncTasks instead of creating new threads
2014-02-14 20:38:21 +00:00
Mac Duy Hai 745413c105 am 60779458: am a50d3430: Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elf
* commit '60779458160eed2f214450c1c708c0ecafe6465a':
  Add method to retrieve search box bounds.
2014-02-14 20:38:20 +00:00
Adam Cohen a9aeb1278a am bfb2ed2f: am 76980e33: Merge "Fix binding problem with no screens (issue 11768766)" into jb-ub-now-jolly-elf
* commit 'bfb2ed2f5efc0e5d9513a539aa96858b58c0c01a':
  Fix binding problem with no screens (issue 11768766)
2014-02-14 20:38:20 +00:00
Adam Cohen 6bc01d4a1b am 6229a0d5: am 6400b84d: Update custom content insets when Workspace insets are set
* commit '6229a0d564d02d661b8b362dbec2bd748675bbfb':
  Update custom content insets when Workspace insets are set
2014-02-14 20:38:18 +00:00
Mathew Inwood 071b346eab am 1eeb3fc9: Generalize support for \'App Info\', \'Uninstall\' and \'Delete\'
* commit '1eeb3fc9d874d98dfb43883d17efb4202d83d88a':
  Generalize support for 'App Info', 'Uninstall' and 'Delete'
2014-02-14 20:38:17 +00:00
Adam Cohen d735122857 am 0a23daac: am 166ebd4d: De-parent custom content view before adding to custom content screen
* commit '0a23daaca14ab7fd107ee3e4043b5793760e02c1':
  De-parent custom content view before adding to custom content screen
2014-02-14 20:38:16 +00:00
Adam Cohen c82aa4cd1e am 52aa0636: am d552dd90: Fix NPE in Launcher onDestroy
* commit '52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2':
  Fix NPE in Launcher onDestroy
2014-02-14 20:38:15 +00:00
Adam Cohen 38ed22eb29 am 9710ec9d: am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
* commit '9710ec9d85566ea1edf973f3d51dda24f64bdaaf':
  Fix NPE in case where workspace is null because Launcher has been destroyed
2014-02-14 20:38:13 +00:00
Dan Sandler fce34b2ff2 am 314aaeca: am a6a296ba: Revert "Enable Launcher2 workspace import."
* commit '314aaeca0ca84583fd637ff398a08d7c31d9b0a5':
  Revert "Enable Launcher2 workspace import."
2014-02-14 20:38:12 +00:00
Michael Jurka 4cb7d294e1 am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
* commit 'e5db9b9db1734659784c2296eaad22f8c579d2ec':
  Making workspace->overview transition smoother
2014-02-14 20:38:11 +00:00
Adam Cohen c1fedf5407 am 616af06a: am cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
* commit '616af06ac5dc7df878086a4f66422e0c9ebbfe29':
  Allowing ability to pick up items / enter overview before full page settle
2014-02-14 20:38:09 +00:00
Dan Sandler 1fbe9d192e am 658e56fc: am 5b3bdd39: Enable Launcher2 workspace import.
* commit '658e56fccae72413b8cb1a3f3a1a425f4d4dd57f':
  Enable Launcher2 workspace import.
2014-02-14 20:38:08 +00:00
Mathew Inwood 0c28076844 am 3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
* commit '3705bb1b794ecb660e1ac57c4a3e99909d71a05e':
  Add support for initiating a drag from an overlay.
2014-02-14 20:38:06 +00:00
Winson Chung aea55e0565 am 954966bc: am 2c130e1f: Reducing workspace grid for dogfooding.
* commit '954966bc2702b19151ab9d13c4983c2ecfb2150a':
  Reducing workspace grid for dogfooding.
2014-02-14 20:38:05 +00:00
Winson Chung c0ed8edf29 am 2e06b6da: am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf
* commit '2e06b6dac2f88307e7e3a3e25031949f14a9fc51':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
2014-02-14 20:38:04 +00:00
Dan Sandler d3701d4223 am 91d30b76: am f0b8dacf: Disable importing workspaces from Launcher2.
* commit '91d30b76779a7911e4252a68c0b70a154b3295c5':
  Disable importing workspaces from Launcher2.
2014-02-14 20:38:02 +00:00
Winson Chung 4168dc497d am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* commit '97436804cd50e292757674c06d5d205d281cb716':
  Initialize FastBitmapDrawable bounds with default bitmap dimensions.
  Updating LauncherModel filtering to use screen ids. (Bug 11685286)
2014-02-14 20:38:01 +00:00
Adam Cohen 3f95006528 am 2aeb1778: am f9618856: Syncing up state transition with paging transition
* commit '2aeb177876602169eb3e360a92ded77a6601ba9b':
  Syncing up state transition with paging transition
2014-02-14 20:37:59 +00:00