bfab00b84a
am 24e0fc12: Merge "Deleting workspace items from db which have an invalid placement" into ub-now-queens
...
* commit '24e0fc122186641adf862327d9266da774f3c25f':
Deleting workspace items from db which have an invalid placement
2014-10-23 19:41:40 +00:00
16c8bebf91
am 09c7fc71: Merge "Removing AccessibleTabView and some other dead code." into ub-now-queens
...
* commit '09c7fc714448cd29faaec374ac9027ca878a3deb':
Removing AccessibleTabView and some other dead code.
2014-10-23 19:41:39 +00:00
69925bb192
am 9c114bb7: (-s ours) am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '9c114bb76edd1fe6bb0cc94b9e413495b7962887':
2014-10-23 19:38:43 +00:00
2e124bc43d
am 298a9c61: am 78d8510a: am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '298a9c61853b7460d5dbe14429f05f8f2deed6bc':
2014-10-23 19:33:04 +00:00
667ca4fe80
am 3a540fc8: am 77ef6b2b: am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
...
* commit '3a540fc85a889e530966d543d53d637b26313961':
2014-10-23 19:33:03 +00:00
0ef051bd3d
am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a003c8ede8026fac754c059c90fde5bc9ba6e309':
Import translations. DO NOT MERGE
2014-10-23 19:33:02 +00:00
38ede6d74b
am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp
...
* commit '9bc59c20d0bc0683c537560ea92c581eeaf1ebe9':
2014-10-23 19:33:01 +00:00
253e9df603
am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr
...
* commit 'a0010b81ad0e179a8336f84da84f7aed3dd54cb5':
2014-10-23 19:27:31 +00:00
a42634a571
am 76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp
...
* commit '76fd2e70bd28668a09edd1e7bb30348b6536b5ad':
2014-10-23 19:27:31 +00:00
10383e2992
am 0f3e2065: (-s ours) Merge commit \'8fa85d20\' into klp-dev-plus-aosp
...
* commit '0f3e20658a2386b68f23c71a83e18b9423e939e9':
Fix overlapping pages (issue 12551580)
Properly saving migration cling keys.
2014-10-23 19:27:30 +00:00
39363a4e11
am ec3aad2e: (-s ours) Merge commit \'d5c6745b\' into klp-dev-plus-aosp
...
* commit 'ec3aad2e30ead7923f659c197c57f843cc55c913':
Tightening migration conditions. (Bug 11973614)
2014-10-23 19:13:36 +00:00
0e375f947b
Some resource fixes for drop target
...
> Making it singleline with ellipsis everywhere
> Decreasing the text size on smaller devices
> Decreasing char limit for various labels
Bug: 17563793
Bug: 17938450
Change-Id: I8ad1a156de0601d07419b2cc6418389bc2e24a4e
2014-10-23 11:41:34 -07:00
5517bdbf4e
Removing landscape string overrides
...
Change-Id: Idbfc600dfb32b195726f1b035d18be92c26883fd
2014-10-23 11:09:18 -07:00
ef728d4292
Refactoring LauncherBackupHelper.java
...
> Moving a bunch of variables to Global level to make it easier
to maintain state.
Change-Id: I9ded313bd4f673f45c61556b8c66607dc78a5ae9
2014-10-23 10:46:14 -07:00
9f0c4b4e12
am 51ac5ce5: am cf09fa12: am b54a5989: Adding optional first run activity to Launcher
...
* commit '51ac5ce545ea800ca8378767a5d7ab17bb6bc884':
2014-10-23 17:32:48 +00:00
cf00d3ca59
am 537ecd45: am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
...
* commit '537ecd451b021545b8d9c4009879fe961bff3de6':
2014-10-23 17:32:48 +00:00
4feb47db8c
am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files
...
* commit '84ae085dc7f37e03d4fe50fc7747f675df32fbb3':
2014-10-23 17:32:47 +00:00
7eb5984112
am de0fc51a: am 32911d21: am 33f4c2df: first backup should save things from the beginning of time
...
* commit 'de0fc51acf071b42a5a337291af9467307917651':
2014-10-23 17:32:46 +00:00
e1b6873efe
am 7dae6109: am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
...
* commit '7dae6109dbae41d7d0d8278c8646023d790693bd':
2014-10-23 17:32:45 +00:00
dcb02a7b6c
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':
2014-10-23 17:32:43 +00:00
ef129c27fc
am 425941d0: am 1d7cf660: am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" into jb-ub-now-kermit
...
* commit '425941d0c20dd242dfb939407e9e95247a19946b':
2014-10-23 17:32:42 +00:00
5e236b7d12
am bd8d3e66: am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
...
* commit 'bd8d3e665ab84a0e65eb274d899000d16770487e':
2014-10-23 17:32:41 +00:00
b6697d53cd
am ad72d13f: am 792ed52a: am 83b0da1a: Removed paddingStart and paddingEnd when they are the same.
...
* commit 'ad72d13f431ea841d8bbf0a1ac6e5490715435b3':
2014-10-23 17:32:40 +00:00
93cdc5236f
am b5b7fd3c: am fbed86e6: am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit
...
* commit 'b5b7fd3c3a2d5bdc540e1c508f2416155f85de18':
2014-10-23 17:32:39 +00:00
df766cfcc5
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':
2014-10-23 17:32:37 +00:00
33951d6383
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':
2014-10-23 17:32:36 +00:00
5826c3c156
am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE
...
* commit '476e00451968fe0388e943e83d3895298031cd09':
2014-10-23 17:32:35 +00:00
7e4c40875d
am c2e2363b: am ef6b1b5c: am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit
...
* commit 'c2e2363bb3021f640c873c4071859f561db224c6':
2014-10-23 17:32:34 +00:00
db9eca39e9
am d76403d6: am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
...
* commit 'd76403d698751cd2505812ab7230c1e4fa5163e9':
2014-10-23 17:32:33 +00:00
fc6dab3117
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':
2014-10-23 17:32:32 +00:00
784bbb1793
am 76fffaea: am 41307509: am f6a22ada: Add auto-detection of payload type
...
* commit '76fffaeaa2963b9cd777f49ce297ef1d0760cd15':
2014-10-23 17:32:31 +00:00
183cec2a2e
am e4618064: am 5d81c91a: am 309260ee: Merge "Don\'t notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit
...
* commit 'e4618064e8f4d5975021c09ec0f7b180eb3818e5':
2014-10-23 17:32:30 +00:00
d1aeb26ad7
am d3d59187: am d2c865d8: am 31ff527a: Update script to pull latest files from Gallery
...
* commit 'd3d591871cc2811d9251ad3c79e7eaa8af58ebfb':
2014-10-23 17:32:29 +00:00
6c49d66add
am 454f4f5b: am 11c15ad0: am 34c2e6cf: Clean up imports
...
* commit '454f4f5b2340f4f4aa4657f6cb5bfadbcdfada99':
2014-10-23 17:32:28 +00:00
8783ac9574
am 7d2e58dd: am 896b9cfc: am 7ad868b8: Create separate project for Wallpaper Picker
...
* commit '7d2e58ddb57e00d50aee28da8e53390a5d3fadac':
2014-10-23 17:32:27 +00:00
c5022b5427
am 71d0183c: am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
...
* commit '71d0183cd9b46877b981673f94fed1f5bf094cca':
2014-10-23 17:32:27 +00:00
a5896d08fd
am 01e377b0: am 132ad329: am 306c1cf2: Show widgets when ALL_APPS is disabled.
...
* commit '01e377b0b0439ef5e4975c7c7dd4c8aea99d2dc6':
2014-10-23 17:32:26 +00:00
b7bb3e73eb
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':
2014-10-23 17:32:25 +00:00
8a11f4bc46
am 0d7ed5fc: am fb07a6ab: am 69413c91: Move additional wallpaper picker files to special dir
...
* commit '0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c':
2014-10-23 17:32:24 +00:00
806bb8de02
am 157b263e: am be71ebfb: am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit
...
* commit '157b263ef9fd463beca54be2ed4267ae022a9542':
2014-10-23 17:32:23 +00:00
447d9c3b56
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':
2014-10-23 17:32:22 +00:00
f2e7e3347d
am 6772fd99: am d6b50a48: am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit
...
* commit '6772fd99c7539b367c1ac5892e6597dd91d2d97f':
2014-10-23 17:32:21 +00:00
e6d2305f62
am 7aa4ac9f: am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints
...
* commit '7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910':
2014-10-23 17:32:20 +00:00
ee81229929
am f810f75f: am bf597a68: am 52a935a2: Merge "expose the protoutil for launcher as an executable script" into jb-ub-now-kermit
...
* commit 'f810f75ffa43533778c5507cac839a3f2e6f722c':
2014-10-23 17:32:19 +00:00
e74f0905d4
am 54dffa11: am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
...
* commit '54dffa118ca3b7439dae8431dd786073bc5fd8ce':
2014-10-23 17:32:18 +00:00
a0fa07a05f
am 5aff893a: am 5ab7187d: am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit
...
* commit '5aff893a2366b274e81c1c23e0c2fb266f080873':
2014-10-23 17:32:17 +00:00
a0a4870ec0
am 6effa1e3: am f2551ffc: am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit
...
* commit '6effa1e3575d196a66446885d3364589ba93090d':
2014-10-23 17:32:17 +00:00
1ebef2df9b
am 8e47355a: am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
...
* commit '8e47355a8fcf5e4c93397b7404e0e2f6dd63c5ab':
2014-10-23 17:32:16 +00:00
cb3d4a61f2
am 465606c2: am 98245209: am fa071f93: Merge "Bind the workspace synchronously if started on -1 screen." into jb-ub-now-kermit
...
* commit '465606c29c9d512f2e473ecba35fbd1accda5c58':
2014-10-23 17:32:15 +00:00
47f75d940e
am 4cd9a102: am 744cbf46: am 8e88cb84: Move wallpaper picker code to a separate directory
...
* commit '4cd9a102a7dd471dc022183d023d18124aa251e9':
2014-10-23 17:32:14 +00:00
Sunny Goyal
Adam Skory
Baligh Uddin
Geoff Mendal
Tom Stamm
Qiwen Zhao
Adam Cohen
Chris Wren
Yura
Winson Chung
Dan Sandler
Mihail Dumitrescu
Nilesh Agrawal
Sandeep Siddhartha
Michael Jurka
Derek Prothro