Commit Graph

3362 Commits

Author SHA1 Message Date
Qiwen Zhao ec3aad2e30 Merge commit 'd5c6745b' into klp-dev-plus-aosp
Conflicts:
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-fa/strings.xml
	res/values-iw/strings.xml
2014-02-14 16:04:37 -08:00
Adam Cohen 51ac5ce545 am cf09fa12: am b54a5989: Adding optional first run activity to Launcher
* commit 'cf09fa1263edfb9b951e5b728b54156db3e40c6b':
  Adding optional first run activity to Launcher
2014-02-14 20:54:54 +00:00
Adam Cohen 537ecd451b am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
* commit '8df1285d0d1291adb3eeab66f9a1b1b77c5cbb73':
  Fix issue where deleting item from folder leaves extra page
2014-02-14 20:54:53 +00:00
Chris Wren de0fc51acf am 32911d21: am 33f4c2df: first backup should save things from the beginning of time
* commit '32911d2124f68747f08460455fab623dcb048f72':
  first backup should save things from the beginning of time
2014-02-14 20:54:52 +00:00
Winson Chung 01880c02f5 am 29a86c26: am 872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit
* commit '29a86c267b890a506c12d1ffadb8db2baaa2e20e':
  Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)
2014-02-14 20:54:51 +00:00
Dan Sandler 425941d0c2 am 1d7cf660: am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
* commit '1d7cf660ce57d0e11718a0f82ff596477063bb45':
  KEYCODE_MENU: hide all apps when entering overview mode
2014-02-14 20:54:50 +00:00
Mihail Dumitrescu bd8d3e665a am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
* commit 'e4c398d36907da10ac0239f53c43763f91f15790':
  Remove a non-obvious fall through in a switch statement.
2014-02-14 20:54:49 +00:00
Nilesh Agrawal b5b7fd3c3a am fbed86e6: am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
* commit 'fbed86e6da1865c38a43e646ea05cc1e6def67e3':
  Allow scrolling folders in when all apps is disabled.
2014-02-14 20:54:48 +00:00
Sandeep Siddhartha 8bea84e396 am eb870e15: am 8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit
* commit 'eb870e154a7e13ccc775fa6ab0c00a3fb6acd845':
  Allow changing search bar hint in the cling on-the-fly
2014-02-14 20:54:47 +00:00
Nilesh Agrawal d76403d698 am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
* commit 'cdf8fe869862fc0ae4d03a90c32d0ddf009d63e4':
  Do not allow duplicate shortcuts when ALL_APPS is disabled.
2014-02-14 20:54:45 +00:00
Adam Cohen e4618064e8 am 5d81c91a: am 309260ee: Merge "Don\'t notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
* commit '5d81c91a11867a579d5cf07a8a8ce4ca1596a861':
  Don't notifyPageSwitchListener until page settles (issue 12069757)
2014-02-14 20:54:42 +00:00
Michael Jurka 454f4f5b23 am 11c15ad0: am 34c2e6cf: Clean up imports
* commit '11c15ad06d684635c36b9dc28766c11baad13938':
  Clean up imports
2014-02-14 20:54:41 +00:00
Michael Jurka 7d2e58ddb5 am 896b9cfc: am 7ad868b8: Create separate project for Wallpaper Picker
* commit '896b9cfc06ef9047812307d7e73a791161d09600':
  Create separate project for Wallpaper Picker
2014-02-14 20:54:40 +00:00
Adam Cohen 71d0183cd9 am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
* commit '19f7dcd5624536544f53a4e53fc1d62b96fdc11b':
  Fix NPE from feedback (issue 12106858)
2014-02-14 20:54:39 +00:00
Nilesh Agrawal 01e377b0b0 am 132ad329: am 306c1cf2: Show widgets when ALL_APPS is disabled.
* commit '132ad3291b833ecaca425ef0e4b4ff9360ccd42b':
  Show widgets when ALL_APPS is disabled.
2014-02-14 20:54:39 +00:00
Michael Jurka 0d7ed5fc5f am fb07a6ab: am 69413c91: Move additional wallpaper picker files to special dir
* commit 'fb07a6ab673ff3bbbcde27bd226c8fcb4bfe5aa7':
  Move additional wallpaper picker files to special dir
2014-02-14 20:54:37 +00:00
Adam Cohen 157b263ef9 am be71ebfb: am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit
* commit 'be71ebfb28ffd7a3e6b085826d157f69c1842b00':
  Don't load items which exceed the grid bounds
2014-02-14 20:54:37 +00:00
Winson Chung ca00240fe4 am cd1092ce: am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
* commit 'cd1092ce7bff3d4c4372a3a93c055d24ffdbaafc':
  Adjusting grid for tablets and fixing incorrect resources for large tablets.
2014-02-14 20:54:36 +00:00
Winson Chung 6772fd99c7 am d6b50a48: am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
* commit 'd6b50a4872fddefeb2fb24538631270af5d52b0c':
  Fixing issue with Widget sizes being icorrectly reported.
2014-02-14 20:54:35 +00:00
Adam Cohen 7aa4ac9f66 am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints
* commit 'd039b6e2546311cb197e93c01b9b2a8752225f0e':
  Fix new NPE relating to reorder hints
2014-02-14 20:54:35 +00:00
Michael Jurka 54dffa118c am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
* commit 'd2f157283c599e49083a89b5c78c64a9258fbe1a':
  Revert "Revert "Move wallpaper picker code to a separate directory""
2014-02-14 20:54:33 +00:00
Dan Sandler 5aff893a23 am 5ab7187d: am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
* commit '5ab7187d6eccd41680314d0a830f5cafe6fe4a3f':
  Size hotseat data structure appropriately.
2014-02-14 20:54:32 +00:00
Adam Cohen 6effa1e357 am f2551ffc: am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
* commit 'f2551ffcd440b990cf49b1a3e2b0f6b8c70c6d45':
  Adding reorder hinting, hopefully will help with (issue 10654628)
2014-02-14 20:54:32 +00:00
Michael Jurka 8e47355a8f am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
* commit '0a667dd4efa69e0f817e8a126df23c1e1f9aab6f':
  Revert "Move wallpaper picker code to a separate directory"
2014-02-14 20:54:31 +00:00
Derek Prothro 465606c29c am 98245209: am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
* commit '98245209f6d97d4f74bfe55cd2ff7e0756ed120b':
  Bind the workspace synchronously if started on -1 screen.
2014-02-14 20:54:30 +00:00
Michael Jurka 4cd9a102a7 am 744cbf46: am 8e88cb84: Move wallpaper picker code to a separate directory
* commit '744cbf4623c5af05495781197423095914988ae2':
  Move wallpaper picker code to a separate directory
2014-02-14 20:54:30 +00:00
Winson Chung 157e789fde am 07c9ade5: am 33231f58: Fixing crash in empty folders. (Bug 11627191)
* commit '07c9ade5be5cc3476dc64d5830568d2a4958129d':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 20:54:29 +00:00
Winson Chung a0a8305a53 am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
* commit 'ffba2dfd7a5a6e60ce45453bde9fc8eb6f2fe4c8':
  Revert "Fixing crash in empty folders. (Bug 11627191)"
2014-02-14 20:54:28 +00:00
Winson Chung e7e472662a am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
* commit '6160c3947ae2aa1080a269279d04862eb7108a8a':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 20:54:28 +00:00
Nilesh Agrawal 2ef2511f03 am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
* commit '0d43ba8c91b4e6cc678cb5cd762f7a38c4406a51':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:54:27 +00:00
Nilesh Agrawal d1ce093cf0 am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
* commit '03ec57d313f3f72b76f3df0cc4a297d3788847e5':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
2014-02-14 20:54:26 +00:00
Nilesh Agrawal e4ccb341d8 am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
* commit 'ac2ddbb4277fd3be025acfdfa930b9f71c9b5ce4':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:54:26 +00:00
Chris Wren b8336373ff am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
* commit '3eaaf7d1c4d7fbd9eaf66cb8548b91a40e8fb308':
  backup launcher preferences
2014-02-14 20:54:25 +00:00
Adam Cohen 4b0b4bceef am 8aebe36d: am 5d518fa7: Decrease delay for closing folder on removal of an item (issue 11028310)
* commit '8aebe36dd9f1f039dc8bca78cf4d3271e3525334':
  Decrease delay for closing folder on removal of an item (issue 11028310)
2014-02-14 20:54:24 +00:00
Michael Jurka 06440fb8ec am 29de7557: am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
* commit '29de7557c5f47e9b3e1fb6a5b9afcd95d5b5b4c0':
  Update suggested wallpaper dimensions in onResume
2014-02-14 20:54:24 +00:00
Adam Cohen 94abcb9847 am b2d3890d: am f9cd258b: am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)
* commit 'b2d3890df47fb9400c45226c4a3c4f4802536469':
  Fix page jumping regression in overview mode (issue 12003672)
2014-02-14 20:54:22 +00:00
Winson Chung 4051b53ee6 am 6b165fa8: am 0ea74f13: Merge "Limit AllApps insets to certain device configurations. (Bug 11451335)" into jb-ub-now-kermit
* commit '6b165fa8d0d01a8e3db6bbc60e2ad79334546259':
  Limit AllApps insets to certain device configurations. (Bug 11451335)
2014-02-14 20:54:22 +00:00
Winson Chung fe71289896 am 89524f48: am 17bde09a: Merge "Retain current AllApps page if we never leave Launcher. (Bug 11468582)" into jb-ub-now-kermit
* commit '89524f48e52a25e18e1d918e96d43c6db9a3deec':
  Retain current AllApps page if we never leave Launcher. (Bug 11468582)
2014-02-14 20:54:21 +00:00
Winson Chung c24021e3de am 88818ab2: am 42b3c068: Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
* commit '88818ab2df2a0b2f665221d803ff49ce4682f07d':
  Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
2014-02-14 20:54:20 +00:00
Adam Cohen 1b6b42e356 am ec6b71a0: am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)
* commit 'ec6b71a008977995f3782c4781b43a360598be1c':
  Add guards for restoreInstanceState (issue 11982812)
2014-02-14 20:54:20 +00:00
Dan Sandler 351453a187 am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf
* commit '0572c31031ea2a0cc9f33afb2b2a4a41618415df':
  Revert "Revert "Enable Launcher2 workspace import.""
2014-02-14 20:54:19 +00:00
Adam Cohen 09d121923b am 7cb06bde: am 87f445c8: am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf
* commit '7cb06bde4981411d8e34e6d37a798d0ea85f138b':
  Only import workspaces for non-tablets (where grid hasn't changed)
2014-02-14 20:54:18 +00:00
Michael Jurka dbd4b06db4 am 512093f3: am 16fa074d: am 1c00fd0b: Fix NPE when going to All Apps in landscape
* commit '512093f3655a1970f1f05605deb219ef9d6ab957':
  Fix NPE when going to All Apps in landscape
2014-02-14 20:54:18 +00:00
Winson Chung 0f39034b12 am f342c5b4: am 0c1b33db: am 2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
* commit 'f342c5b4324b0aa052b89d4016673e1735df5e90':
  Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
2014-02-14 20:54:17 +00:00
Winson Chung 5c502d7134 am 1cfabb7f: am ab84b8b4: am 1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)" into jb-ub-now-jolly-elf
* commit '1cfabb7f144b8691279b322aaf1827339c447cbe':
  Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)
2014-02-14 20:54:16 +00:00
Michael Jurka 93ebd399da am 082893ff: am 3ed4a4dd: am 10a8935e: Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elf
* commit '082893ffbac31567360c26c1df1e5c1c61af7f5c':
  Use AsyncTasks instead of creating new threads
2014-02-14 20:54:16 +00:00
Mac Duy Hai ecf352fbba am 745413c1: am 60779458: am a50d3430: Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elf
* commit '745413c10594c6694fedc2e3bf39d03e368a3b7c':
  Add method to retrieve search box bounds.
2014-02-14 20:54:15 +00:00
Adam Cohen 546dc3d977 am a9aeb127: am bfb2ed2f: am 76980e33: Merge "Fix binding problem with no screens (issue 11768766)" into jb-ub-now-jolly-elf
* commit 'a9aeb1278a338e6235138d8bccee7d1a3a3e271b':
  Fix binding problem with no screens (issue 11768766)
2014-02-14 20:54:14 +00:00
Adam Cohen d84e8a463d am 6bc01d4a: am 6229a0d5: am 6400b84d: Update custom content insets when Workspace insets are set
* commit '6bc01d4a1b337290f056947a964d604514e5207f':
  Update custom content insets when Workspace insets are set
2014-02-14 20:54:13 +00:00
Mathew Inwood 573b7f0638 am 071b346e: am 1eeb3fc9: Generalize support for \'App Info\', \'Uninstall\' and \'Delete\'
* commit '071b346eab89494e79c1ffa834a4083e0565bfb7':
  Generalize support for 'App Info', 'Uninstall' and 'Delete'
2014-02-14 20:54:13 +00:00