Commit Graph

8655 Commits

Author SHA1 Message Date
Qiwen Zhao 8757491afe am ec3aad2e: Merge commit \'d5c6745b\' into klp-dev-plus-aosp
* commit 'ec3aad2e30ead7923f659c197c57f843cc55c913':
  Tightening migration conditions. (Bug 11973614)
  Increasing string length for translation (Bug 12524122)
  Import translations. DO NOT MERGE
  Set App context from WallpaperChanged receiver. (Bug 12525684)
  Updating assets and text for migration cling. (Bug 11973614)
  Adding migration Clings. (Bug 11973614)
  New launcher2 icon migration algorithm.
  Quick patch for b/12446428.
  Allow DISABLE_ALL_APPS to be set using a system property.
2014-02-15 00:06:35 +00:00
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 f3e2124636 am 51ac5ce5: am cf09fa12: am b54a5989: Adding optional first run activity to Launcher
* commit '51ac5ce545ea800ca8378767a5d7ab17bb6bc884':
  Adding optional first run activity to Launcher
2014-02-14 21:02:57 +00:00
Adam Cohen 36286c8deb am 537ecd45: am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
* commit '537ecd451b021545b8d9c4009879fe961bff3de6':
  Fix issue where deleting item from folder leaves extra page
2014-02-14 21:02:56 +00:00
Chris Wren 4646fd7899 am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files
* commit '84ae085dc7f37e03d4fe50fc7747f675df32fbb3':
  better support for multiple files
2014-02-14 21:02:55 +00:00
Chris Wren 9c2895fb0e am de0fc51a: am 32911d21: am 33f4c2df: first backup should save things from the beginning of time
* commit 'de0fc51acf071b42a5a337291af9467307917651':
  first backup should save things from the beginning of time
2014-02-14 21:02:55 +00:00
Yura 54b80a6b05 am 7dae6109: am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
* commit '7dae6109dbae41d7d0d8278c8646023d790693bd':
  Moved paddingStart to -v17 folder.
2014-02-14 21:02:54 +00:00
Winson Chung c2c22a80f0 am 01880c02: am 29a86c26: am 872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit
* commit '01880c02f5200e2faad1459fb8531dfeb5cf38cb':
  Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)
2014-02-14 21:02:54 +00:00
Dan Sandler d67fb201e9 am 425941d0: am 1d7cf660: am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
* commit '425941d0c20dd242dfb939407e9e95247a19946b':
  KEYCODE_MENU: hide all apps when entering overview mode
2014-02-14 21:02:53 +00:00
Mihail Dumitrescu b4bddde421 am bd8d3e66: am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
* commit 'bd8d3e665ab84a0e65eb274d899000d16770487e':
  Remove a non-obvious fall through in a switch statement.
2014-02-14 21:02:52 +00:00
Yura 81a877ac1c am ad72d13f: am 792ed52a: am 83b0da1a: Removed paddingStart and paddingEnd when they are the same.
* commit 'ad72d13f431ea841d8bbf0a1ac6e5490715435b3':
  Removed paddingStart and paddingEnd when they are the same.
2014-02-14 21:02:52 +00:00
Nilesh Agrawal e856f62dcf am b5b7fd3c: am fbed86e6: am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
* commit 'b5b7fd3c3a2d5bdc540e1c508f2416155f85de18':
  Allow scrolling folders in when all apps is disabled.
2014-02-14 21:02:51 +00:00
Sandeep Siddhartha 95e465f1fd am 8bea84e3: am eb870e15: am 8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" into jb-ub-now-kermit
* commit '8bea84e396ac6feb54d8009165f428b87157e084':
  Allow changing search bar hint in the cling on-the-fly
2014-02-14 21:02:50 +00:00
Baligh Uddin 2e6ad33d4a am c7cdc43e: (-s ours) am 72af7f8d: (-s ours) am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE
* commit 'c7cdc43ef3f3fb7799dbf2fc68be96c70cdc422c':
  Import translations. DO NOT MERGE
2014-02-14 21:02:50 +00:00
Baligh Uddin f0257dd566 am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE
* commit '476e00451968fe0388e943e83d3895298031cd09':
  Import translations. DO NOT MERGE
2014-02-14 21:02:49 +00:00
Chris Wren d17b38d026 am c2e2363b: am ef6b1b5c: am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
* commit 'c2e2363bb3021f640c873c4071859f561db224c6':
  support multiple files and fix logcat smippets for launcher_protoutil
2014-02-14 21:02:48 +00:00
Nilesh Agrawal 3ff20ad022 am d76403d6: am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
* commit 'd76403d698751cd2505812ab7230c1e4fa5163e9':
  Do not allow duplicate shortcuts when ALL_APPS is disabled.
2014-02-14 21:02:48 +00:00
Baligh Uddin 2a4bc46f3c am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit '9b4d5a425be9f641076f32da863b04e009de1922':
  Import translations. DO NOT MERGE
2014-02-14 21:02:40 +00:00
Chris Wren 0c03240044 am 76fffaea: am 41307509: am f6a22ada: Add auto-detection of payload type
* commit '76fffaeaa2963b9cd777f49ce297ef1d0760cd15':
  Add auto-detection of payload type
2014-02-14 21:02:40 +00:00
Adam Cohen 6b3ce791a4 am e4618064: am 5d81c91a: am 309260ee: Merge "Don\'t notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
* commit 'e4618064e8f4d5975021c09ec0f7b180eb3818e5':
  Don't notifyPageSwitchListener until page settles (issue 12069757)
2014-02-14 21:02:39 +00:00
Michael Jurka b4928cda7d am d3d59187: am d2c865d8: am 31ff527a: Update script to pull latest files from Gallery
* commit 'd3d591871cc2811d9251ad3c79e7eaa8af58ebfb':
  Update script to pull latest files from Gallery
2014-02-14 21:02:38 +00:00
Michael Jurka 8b189cc16f am 454f4f5b: am 11c15ad0: am 34c2e6cf: Clean up imports
* commit '454f4f5b2340f4f4aa4657f6cb5bfadbcdfada99':
  Clean up imports
2014-02-14 21:02:38 +00:00
Michael Jurka 959f0914cc am 7d2e58dd: am 896b9cfc: am 7ad868b8: Create separate project for Wallpaper Picker
* commit '7d2e58ddb57e00d50aee28da8e53390a5d3fadac':
  Create separate project for Wallpaper Picker
2014-02-14 21:02:37 +00:00
Adam Cohen d5a2eef996 am 71d0183c: am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
* commit '71d0183cd9b46877b981673f94fed1f5bf094cca':
  Fix NPE from feedback (issue 12106858)
2014-02-14 21:02:36 +00:00
Nilesh Agrawal 3beb1435e3 am 01e377b0: am 132ad329: am 306c1cf2: Show widgets when ALL_APPS is disabled.
* commit '01e377b0b0439ef5e4975c7c7dd4c8aea99d2dc6':
  Show widgets when ALL_APPS is disabled.
2014-02-14 21:02:35 +00:00
Baligh Uddin 38d97b5eb8 am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit 'cd0f6e0cd5ab3271897064b28cecc50c0a481ca8':
  Import translations. DO NOT MERGE
2014-02-14 21:02:35 +00:00
Michael Jurka f375553372 am 0d7ed5fc: am fb07a6ab: am 69413c91: Move additional wallpaper picker files to special dir
* commit '0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c':
  Move additional wallpaper picker files to special dir
2014-02-14 21:02:34 +00:00
Adam Cohen d552cfcd63 am 157b263e: am be71ebfb: am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit
* commit '157b263ef9fd463beca54be2ed4267ae022a9542':
  Don't load items which exceed the grid bounds
2014-02-14 21:02:33 +00:00
Winson Chung 4c8a8f2f9f am ca00240f: am cd1092ce: am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
* commit 'ca00240fe4584768446fbb5f68eda8b7871fee9f':
  Adjusting grid for tablets and fixing incorrect resources for large tablets.
2014-02-14 21:02:33 +00:00
Winson Chung 3b7f0afc64 am 6772fd99: am d6b50a48: am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
* commit '6772fd99c7539b367c1ac5892e6597dd91d2d97f':
  Fixing issue with Widget sizes being icorrectly reported.
2014-02-14 21:02:32 +00:00
Adam Cohen 5be0fa4846 am 7aa4ac9f: am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints
* commit '7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910':
  Fix new NPE relating to reorder hints
2014-02-14 21:02:32 +00:00
Chris Wren 28a21e6bd7 am f810f75f: am bf597a68: am 52a935a2: Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
* commit 'f810f75ffa43533778c5507cac839a3f2e6f722c':
  expose the protoutil for launcher as an executable script
2014-02-14 21:02:31 +00:00
Michael Jurka cf90862530 am 54dffa11: am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
* commit '54dffa118ca3b7439dae8431dd786073bc5fd8ce':
  Revert "Revert "Move wallpaper picker code to a separate directory""
2014-02-14 21:02:30 +00:00
Dan Sandler e36ab7f5f6 am 5aff893a: am 5ab7187d: am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
* commit '5aff893a2366b274e81c1c23e0c2fb266f080873':
  Size hotseat data structure appropriately.
2014-02-14 21:02:30 +00:00
Adam Cohen 23855187f7 am 6effa1e3: am f2551ffc: am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
* commit '6effa1e3575d196a66446885d3364589ba93090d':
  Adding reorder hinting, hopefully will help with (issue 10654628)
2014-02-14 21:02:29 +00:00
Michael Jurka 04b9ef2cbe am 8e47355a: am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
* commit '8e47355a8fcf5e4c93397b7404e0e2f6dd63c5ab':
  Revert "Move wallpaper picker code to a separate directory"
2014-02-14 21:02:28 +00:00
Derek Prothro 429b4273a3 am 465606c2: am 98245209: am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
* commit '465606c29c9d512f2e473ecba35fbd1accda5c58':
  Bind the workspace synchronously if started on -1 screen.
2014-02-14 21:02:28 +00:00
Michael Jurka 24ecbf6d3c am 4cd9a102: am 744cbf46: am 8e88cb84: Move wallpaper picker code to a separate directory
* commit '4cd9a102a7dd471dc022183d023d18124aa251e9':
  Move wallpaper picker code to a separate directory
2014-02-14 21:02:27 +00:00
Winson Chung 3c182d33ce am 157e789f: am 07c9ade5: am 33231f58: Fixing crash in empty folders. (Bug 11627191)
* commit '157e789fded47e22d93a550658c51ea304ec3b76':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 21:02:26 +00:00
Winson Chung 356b47defd am a0a8305a: am ffba2dfd: am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf
* commit 'a0a8305a53ff52ad0222b113d084a86bd2bd6a12':
  Revert "Fixing crash in empty folders. (Bug 11627191)"
2014-02-14 21:02:26 +00:00
Winson Chung 6bce875df1 am e7e47266: am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf
* commit 'e7e472662a924b7f23b1be19594b9daf601ff43e':
  Fixing crash in empty folders. (Bug 11627191)
2014-02-14 21:02:25 +00:00
Nilesh Agrawal 7908978109 am 2ef2511f: am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
* commit '2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 21:02:25 +00:00
Nilesh Agrawal a24de42294 am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
* commit 'd1ce093cf026ca3ee3072adeca13e28c97d34b68':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."
2014-02-14 21:02:24 +00:00
Nilesh Agrawal dfa1993e65 am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit
* commit 'e4ccb341d890e01e1f365c1ed8880a581985c034':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 21:02:23 +00:00
Chris Wren f3d1cc1bf5 am b8336373: am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit
* commit 'b8336373ffe1c39532e4645cbcc938c7676f3943':
  backup launcher preferences
2014-02-14 21:02:23 +00:00
Adam Cohen c5890e8ce2 am 4b0b4bce: am 8aebe36d: am 5d518fa7: Decrease delay for closing folder on removal of an item (issue 11028310)
* commit '4b0b4bceefef4573fbb913fd49f105f2d76dcff2':
  Decrease delay for closing folder on removal of an item (issue 11028310)
2014-02-14 21:02:22 +00:00
Michael Jurka 3606ae0a48 am 06440fb8: am 29de7557: am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit
* commit '06440fb8ecd085a4e383552232001f2bc1291f91':
  Update suggested wallpaper dimensions in onResume
2014-02-14 21:02:21 +00:00
Winson Chung eb81222633 am 86ee1473: am 9026ce17: am 58705534: am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf
* commit '86ee1473fbb53e4fa75b284711ae08cc798c73c9':
  Fixing regression in drop target bar height. (Bug 11980757)
2014-02-14 21:02:20 +00:00
Adam Cohen ad7e86fbc3 am 94abcb98: am b2d3890d: am f9cd258b: am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)
* commit '94abcb984719c8a3f6a3cff14aad3d95a8c9df26':
  Fix page jumping regression in overview mode (issue 12003672)
2014-02-14 21:02:19 +00:00
Winson Chung 42e3066840 am 4051b53e: am 6b165fa8: am 0ea74f13: Merge "Limit AllApps insets to certain device configurations. (Bug 11451335)" into jb-ub-now-kermit
* commit '4051b53ee65d5f3e07f87fcd901601f58c817400':
  Limit AllApps insets to certain device configurations. (Bug 11451335)
2014-02-14 21:02:19 +00:00