Qiwen Zhao
e6cf2e0c8a
am 9a58fb53: am 42de0037: am bb0086ae: am 45d8f947: snap it from jb-ub-now-indigo-rose at 4d3f022c9a
...
* commit '9a58fb53f323ec19d558e63ffe8483619718c57e':
2014-10-29 07:01:08 +00:00
Adam Cohen
ade342d96a
am 1d562437: (-s ours) am 5e9680e9: (-s ours) am d53e22d2: am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
...
* commit '1d56243748aec4c854bd79d5963b2217d14d591e':
2014-10-29 07:01:07 +00:00
Winson Chung
a42b3718f5
am a3dd7f1f: (-s ours) am 440e66e8: (-s ours) am e1a015da: am a78b25f8: DO NOT MERGE
...
* commit 'a3dd7f1fcc086146643b6edc5aa37dbf5343d2ff':
2014-10-29 07:01:07 +00:00
Ed Heyl
b718fd06b6
am c5afe6f8: am 01cc8b5e: am 7138e5e0: am 17e01a29: keep history after reset to git reset to 6811c5a414
...
* commit 'c5afe6f8f5658f8509b9735295bece3ae50d14aa':
2014-10-29 07:01:06 +00:00
Ed Heyl
52a58e894f
am 388c7d27: am c0fa603b: am 8363be7e: am 6811c5a4: override Launcher2 (aosp)
...
* commit '388c7d2783a60be99e76f8cc526b5106a755590b':
2014-10-29 07:01:05 +00:00
Bjorn Bringert
07cbd17633
am 7a20d40f: am 27414260: am b6ccd36a: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose
...
* commit '7a20d40ffeb7615efff22f75c44153e6502cf40c':
2014-10-29 07:01:04 +00:00
Baligh Uddin
f76eb724fe
am db90cb60: (-s ours) am 0e27ebef: (-s ours) am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE
...
* commit 'db90cb6081509e13428534170cf714727550fe1a':
2014-10-29 07:01:03 +00:00
Ed Heyl
a08fac7947
am 8695789a: am 10f0db9f: keep history after reset to git reset to 8246a1434c
...
* commit '8695789a3ff6bbcdae0b6c08805d5b29c6fe50bc':
override Launcher2 (aosp)
2014-10-29 07:01:02 +00:00
Adam Cohen
d4fca963cc
Make sure DragLayer layout params are of the correct type
...
bug 18141419
CP of bc927f9c24
Change-Id: I50695a62cf9e1f25c054ac2c7197cd056d54cfae
2014-10-28 23:46:52 +00:00
Sunny Goyal
8f266025dc
am f659c985: Merge "Fixing insets of launcher clings" into ub-now-queens
...
* commit 'f659c985e6ba9c7866d45b3865325290172062b4':
Fixing insets of launcher clings
2014-10-28 23:40:17 +00:00
Sunny Goyal
f659c985e6
Merge "Fixing insets of launcher clings" into ub-now-queens
2014-10-28 23:37:11 +00:00
Sunny Goyal
75f8adf06c
Fixing insets of launcher clings
...
Change-Id: Idbf46680f96086c93d667c26dc9ed214eeaf835e
2014-10-28 16:30:34 -07:00
Adam Cohen
e3b4d795ec
am bc927f9c: Make sure DragLayer layout params are of the correct type
...
* commit 'bc927f9c24001e250622ca9a2547ee5b65baef58':
Make sure DragLayer layout params are of the correct type
2014-10-28 23:24:26 +00:00
Adam Cohen
bc927f9c24
Make sure DragLayer layout params are of the correct type
...
bug 18141419
Change-Id: I50695a62cf9e1f25c054ac2c7197cd056d54cfae
2014-10-28 16:16:46 -07:00
Sunny Goyal
33d4438976
Updating backup restore logic
...
> Adding DeviceProfile information in the backup
> Removing SharedPreference backup
> Adding helper methods to abort backup in the middle
> Comparing keys against the backup journal during restore
to avoid restoring corrupt/lost entries
> Old backups are still compatible, but lost keys verification
will be ignored in that case.
Bug: 17937935
Bug: 17951775
Bug: 17260941
Change-Id: Iad48646cfdd69abaff5c163b2055f3b8a9b39b19
2014-10-28 09:27:10 -07:00
Sunny Goyal
91db0610be
am 09ae4aef: Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens
...
* commit '09ae4aef52b4486b97ecc77feeb64307bcbd3993':
Loading internal default layout if partner layout fails to load
2014-10-28 05:11:46 +00:00
Sunny Goyal
f55f7cac7f
am bb4ae1d2: Merge "Removing landscape string overrides" into ub-now-queens
...
* commit 'bb4ae1d26a11a1211ce793278a878fa3cb224ff5':
Removing landscape string overrides
2014-10-28 05:11:44 +00:00
Geoff Mendal
0e594fd559
am e790dfdc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
...
* commit 'e790dfdc4f46983b8416ef39b6112e91c10f9b51':
Import translations. DO NOT MERGE
2014-10-28 05:11:44 +00:00
Adam Cohen
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
Sunny Goyal
09ae4aef52
Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens
2014-10-28 00:15:42 +00:00
Sunny Goyal
bb4ae1d26a
Merge "Removing landscape string overrides" into ub-now-queens
2014-10-27 23:29:51 +00:00
Sunny Goyal
9d219685c5
Loading internal default layout if partner layout fails to load
...
Bug: 18033885
Change-Id: I8399d0107cc3570c0e03d833601abf2cd194b3d3
2014-10-27 16:28:44 -07:00
Geoff Mendal
e790dfdc4f
Merge "Import translations. DO NOT MERGE" into ub-now-queens
2014-10-27 18:20:20 +00:00
Geoff Mendal
457ebaf51d
Import translations. DO NOT MERGE
...
Change-Id: Iff6f42e2460ae8c08dda9170361be3f010f32b48
Auto-generated-cl: translation import
2014-10-27 11:07:51 -07:00
Geoff Mendal
7078af9080
Import translations. DO NOT MERGE
...
Change-Id: I004c34f906b345b3206cb45dff0710e243171a10
Auto-generated-cl: translation import
2014-10-27 11:07:12 -07:00
Adam Cohen
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
Adam Cohen
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
Adam Cohen
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
Adam Cohen
be25822f76
Add InsettableFrameLayout layout params to easily ignore insets
...
Change-Id: I117fc34627e24ea5f909c3c87e9c2dbca46babb6
2014-10-24 16:46:19 -07:00
Adam Cohen
0fb5ce20d7
Tweaking close AllApps / Widgets on KK and below
...
Bug: 17956862
Change-Id: I83b8973b7e98c1c3660221ac65dcb9ca8b4c84fd
2014-10-24 14:15:35 -07:00
Adam Cohen
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
Adam Cohen
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
Sunny Goyal
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
Adam Cohen
ac36ed6d5a
Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens
2014-10-24 19:52:49 +00:00
Adam Cohen
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
Adam Cohen
32e34b8405
Merge "Allow LauncherOverlay to access and manage insets" into ub-now-queens
2014-10-24 19:05:15 +00:00
Adam Cohen
a6d0492e5f
Allow LauncherOverlay to access and manage insets
...
Change-Id: Ib9faf37eb22ad2a0b18c076978ec9f2fd8864c0c
2014-10-24 11:47:30 -07:00
Sunny Goyal
d8cec0945e
Disabling restore for below L devices
...
Change-Id: I262f52e88421637e0d50c048f6d53c6b5754da4e
2014-10-23 20:04:59 -07:00
Neil Fuller
23582d7da0
am f1340f18: Merge "Remove dependencies on FloatMath"
...
* commit 'f1340f1810464ec656262141326c87b3896a3550':
Remove dependencies on FloatMath
2014-10-23 22:30:10 +00:00
Baligh Uddin
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
Huy Nguyen
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
Mark Ashdown
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
Huy Nguyen
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
Sunny Goyal
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
Mark Ashdown
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
Mathew Inwood
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
Sunny Goyal
4a080dcadd
Merge "Some resource fixes for drop target" into ub-now-queens
2014-10-23 20:29:06 +00:00
Sunny Goyal
f0de36184b
am ef728d42: Refactoring LauncherBackupHelper.java
...
* commit 'ef728d42927f127fe8d1fc075aef312892388901':
Refactoring LauncherBackupHelper.java
2014-10-23 19:52:39 +00:00
Juan Silveira
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
Anton Hansson
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