eb4a8106ad
am 8c4ca927: Fix edge case where LauncherOverlay scroll woudln\'t be reset
...
* commit '8c4ca9277dcb92cb965a1e58eef59ad9868ae44e':
Fix edge case where LauncherOverlay scroll woudln't be reset
2014-10-28 05:11:43 +00:00
09ae4aef52
Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens
2014-10-28 00:15:42 +00:00
bb4ae1d26a
Merge "Removing landscape string overrides" into ub-now-queens
2014-10-27 23:29:51 +00:00
9d219685c5
Loading internal default layout if partner layout fails to load
...
Bug: 18033885
Change-Id: I8399d0107cc3570c0e03d833601abf2cd194b3d3
2014-10-27 16:28:44 -07:00
e790dfdc4f
Merge "Import translations. DO NOT MERGE" into ub-now-queens
2014-10-27 18:20:20 +00:00
457ebaf51d
Import translations. DO NOT MERGE
...
Change-Id: Iff6f42e2460ae8c08dda9170361be3f010f32b48
Auto-generated-cl: translation import
2014-10-27 11:07:51 -07:00
7078af9080
Import translations. DO NOT MERGE
...
Change-Id: I004c34f906b345b3206cb45dff0710e243171a10
Auto-generated-cl: translation import
2014-10-27 11:07:12 -07:00
8c4ca9277d
Fix edge case where LauncherOverlay scroll woudln't be reset
...
-> If the Workspace has a single page and the user goes from overscrolling
in one direction, and then the other, the LauncherOverlay scroll wouldn't
be set to 0 until the scrolling settled
Change-Id: I29ee9abdfa023ae3599d1590cdaebf457e2220fa
2014-10-24 17:42:33 -07:00
c99d74704d
am be25822f: Add InsettableFrameLayout layout params to easily ignore insets
...
* commit 'be25822f7677f376f9687e6a66cfa54739c40700':
Add InsettableFrameLayout layout params to easily ignore insets
2014-10-25 00:35:38 +00:00
acb3d68403
am 0fb5ce20: Tweaking close AllApps / Widgets on KK and below
...
* commit '0fb5ce20d7ae49f63628f88a1a238d6e2247dfe9':
Tweaking close AllApps / Widgets on KK and below
2014-10-24 23:49:36 +00:00
be25822f76
Add InsettableFrameLayout layout params to easily ignore insets
...
Change-Id: I117fc34627e24ea5f909c3c87e9c2dbca46babb6
2014-10-24 16:46:19 -07:00
0fb5ce20d7
Tweaking close AllApps / Widgets on KK and below
...
Bug: 17956862
Change-Id: I83b8973b7e98c1c3660221ac65dcb9ca8b4c84fd
2014-10-24 14:15:35 -07:00
9220b912d8
am ac36ed6d: Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens
...
* commit 'ac36ed6d5a08b508b3c610cc06a19799da2deb55':
Was seeing some duplicated icons in the migration flow
2014-10-24 21:14:49 +00:00
4f0f57fef7
am 32e34b84: Merge "Allow LauncherOverlay to access and manage insets" into ub-now-queens
...
* commit '32e34b840576a6857e6ccd308ba9ef1d18f649fe':
Allow LauncherOverlay to access and manage insets
2014-10-24 21:14:48 +00:00
eec7759ce4
am d8cec094: Disabling restore for below L devices
...
* commit 'd8cec0945e1d2790e68ca76362aa6ff9c5f8e370':
Disabling restore for below L devices
2014-10-24 21:14:48 +00:00
ac36ed6d5a
Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens
2014-10-24 19:52:49 +00:00
a33f11e20a
Was seeing some duplicated icons in the migration flow
...
-> The only delta between the two icons was slightly different flags
-> No need to consider flags for the purposes of duplication
Change-Id: I161f6ad6023d829e5ebbb15f1a9fbc9306795d80
2014-10-24 12:44:20 -07:00
32e34b8405
Merge "Allow LauncherOverlay to access and manage insets" into ub-now-queens
2014-10-24 19:05:15 +00:00
a6d0492e5f
Allow LauncherOverlay to access and manage insets
...
Change-Id: Ib9faf37eb22ad2a0b18c076978ec9f2fd8864c0c
2014-10-24 11:47:30 -07:00
d8cec0945e
Disabling restore for below L devices
...
Change-Id: I262f52e88421637e0d50c048f6d53c6b5754da4e
2014-10-23 20:04:59 -07:00
23582d7da0
am f1340f18: Merge "Remove dependencies on FloatMath"
...
* commit 'f1340f1810464ec656262141326c87b3896a3550':
Remove dependencies on FloatMath
2014-10-23 22:30:10 +00:00
24082c8a0d
am 3a9f3a78: am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658
...
* commit '3a9f3a7806a0153865415d6207c6812915d3f6b1':
2014-10-23 22:30:09 +00:00
f6619645af
am efaf2c85: am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'efaf2c857aac326df2051ac2c419be26bd3d5a6f':
2014-10-23 22:30:09 +00:00
ee9d8dfdf3
am 16880deb: am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '16880deb08a89ed5cf7e9453f9391ec5c3ce9bce':
2014-10-23 22:30:07 +00:00
7c2f8b47cf
am 9e5d50c6: (-s ours) am 49635c71: (-s ours) am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '9e5d50c6de67b17c01b486a66e3c25070b456ebc':
2014-10-23 22:30:01 +00:00
4b9d486c07
am 4a080dca: Merge "Some resource fixes for drop target" into ub-now-queens
...
* commit '4a080dcadd532dd259de596729a1cd6e949bdae4':
Some resource fixes for drop target
2014-10-23 21:23:53 +00:00
29923f5082
am 6cea6748: (-s ours) am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '6cea6748431f5ba346cbee61f569812590fa8a46':
2014-10-23 21:10:20 +00:00
7118d9dd17
am d6518c4b: (-s ours) am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'd6518c4b9569ddf9a8d66e4e60dc77c18e0ecb05':
2014-10-23 20:51:24 +00:00
4a080dcadd
Merge "Some resource fixes for drop target" into ub-now-queens
2014-10-23 20:29:06 +00:00
f0de36184b
am ef728d42: Refactoring LauncherBackupHelper.java
...
* commit 'ef728d42927f127fe8d1fc075aef312892388901':
Refactoring LauncherBackupHelper.java
2014-10-23 19:52:39 +00:00
ede7e7e318
am 58dcef7b: am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '58dcef7b28ec0bbc8e097b2cd45a6c6542a4cdef':
2014-10-23 19:49:44 +00:00
d223b88f0d
am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'cd76f89f127b3a817f486ec14d76de9d79ecd5bb':
2014-10-23 19:49:43 +00:00
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
Adam Cohen
Sunny Goyal
Geoff Mendal
Neil Fuller
Baligh Uddin
Huy Nguyen
Mark Ashdown
Mathew Inwood
Juan Silveira
Anton Hansson
Adam Skory
Tom Stamm
Qiwen Zhao
Chris Wren