Anton Hansson
cb168d34ae
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 0274f0a568
* commit '0274f0a568fed5aa57d0c40acfb74bea67cba29a':
2015-10-20 00:28:46 +00:00
Adam Skory
5c597e4aba
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 5cc929caa0
* commit '5cc929caa0922e0b80dbf3f6c099d841c3797c20':
2015-10-20 00:28:39 +00:00
Baligh Uddin
319e21ec62
keep history after reset to ub-now-lunchbox-release@1069658
...
am: 2b8dbe3a5f
* commit '2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c':
Import translations. DO NOT MERGE
Fix overlapping pages (issue 12551580)
Properly saving migration cling keys.
Tightening migration conditions. (Bug 11973614)
Import translations. DO NOT MERGE
Fix build
Import translations. DO NOT MERGE
Initial empty repository
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
override Launcher2 (aosp)
2015-10-20 00:28:33 +00:00
Huy Nguyen
a59ef0ba69
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 8dc2ca68c1
* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':
2015-10-20 00:28:28 +00:00
Mark Ashdown
b7b834bde1
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: a2bc37722e
* commit 'a2bc37722e9fa0af9d67986038aec58af5308771':
2015-10-20 00:28:23 +00:00
Huy Nguyen
2feee6dec2
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 6cb8ae4c16
* commit '6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':
2015-10-20 00:28:15 +00:00
Mark Ashdown
68c0bedde8
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 7c9f33481f
* commit '7c9f33481fd3c063495813b2772e198ed696e3ce':
2015-10-20 00:28:10 +00:00
Mathew Inwood
52cced3ede
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 56ca86b7c1
* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':
2015-10-20 00:28:05 +00:00
Juan Silveira
b6973a57c3
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 07130d400c
* commit '07130d400c52518e413e58334525f1598c3b8f1a':
2015-10-20 00:28:01 +00:00
Anton Hansson
216a53f0b1
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: d0642c4274
* commit 'd0642c4274abcbede9177d61b0f072689db889a9':
2015-10-20 00:27:55 +00:00
Adam Skory
61172868fd
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 853b55b96e
* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':
2015-10-20 00:27:51 +00:00
Adam Skory
d072686669
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
am: 9e3ebf3c95
* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
2015-10-20 00:27:43 +00:00
Adam Skory
f8f29b43ff
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
...
am: 381fa3fb2d
* commit '381fa3fb2d990f7976a898c16f3675dbb325b848':
2015-10-20 00:27:39 +00:00
Adam Cohen
ae5f7ce8ed
Merge "Fixing typo from previous CL" into ub-now-porkchop
2014-10-14 22:09:00 +00:00
Adam Cohen
d61a638e99
Fixing typo from previous CL
...
Bug 17969770
Change-Id: I4ea04864000d2ed8368ca81ba8cff42b4208d13d
2014-10-14 15:06:54 -07:00
Adam Cohen
755dd70238
Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
2014-10-14 22:00:42 +00:00
Sunny Goyal
8cce9dd83a
DO NOT MERGE
...
Rechecking unrestored items when launcher gets created
Bug: 17941096
Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f
2014-10-14 14:02:31 -07:00
Adam Cohen
eb1ac42fd4
Fix missing screen when adding widget directly to provider
...
bug: 17969770
Change-Id: Icbd8451d8adde0519917a7bf06365517405759fe
2014-10-14 10:36:27 -07:00
Ian Parkinson
0c2918f4f4
Use View.generateViewId if available
...
Bug: 17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
2014-10-06 14:27:16 +01:00
Adam Cohen
4b8d11fcb3
Add missing xxhdpi asset
...
Bug: 17813013
Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42
2014-10-03 13:47:11 -07:00
Kenny Guy
0cd271918a
Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
2014-10-03 12:16:59 +00:00
Kenny Guy
92d6d3b275
Remove reference to CODENAME from compat code.
...
Fixes bug with uninstalling apps for managed profile
as codename check means it fails to include the user
when uninstalling the app.
Bug: 17800161
Change-Id: I6901eff5aa8f00fb3b859e8db37930b95f031625
2014-10-03 12:15:53 +01:00
Adam Cohen
52077b7a95
Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop
2014-09-30 23:03:40 +00:00
Bjorn Bringert
2ed99e861b
Build Launcher3 against prebuilt SDK 21
...
Bug: 17507423
Change-Id: I9d6dc856bb29e5d0b3926bde437895d0f2ca7b74
2014-09-30 18:53:39 +01:00
Adam Cohen
1a85c5839c
Don't let old Launcher activity interfere with new one
...
-> Launcher uses a static instance of it's loader (across
multiple activities) since activities can come and go
(configuration change, eg.) but the data model and loading
is static.
-> Currently, this is not robust to a sequence of events that
looks like onCreate(instance A), onCreate(instance B),
onDestroy(instance B) -- depending on the timing of those
calls.
-> This CL addresses a symptom of the above scenario by not
allowing an older Launcher Activity cancel the loader /
clear the callbacks for a newer Activity.
Bug 17679693
Change-Id: I8ece93e288464b0d578b9669c165b67132d997ed
2014-09-30 10:23:18 -07:00
Sunny Goyal
6d467e27b7
Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
2014-09-29 02:57:18 +00:00
Sunny Goyal
42de82ff8d
Resetting launcherProvider data if restore set was empty
...
Bug: 17332300
Change-Id: I6d2187cd1b1fa7a53e49b96eb109263f6b74b258
2014-09-28 17:02:03 -07:00
Baligh Uddin
1004713867
Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
2014-09-28 19:22:39 +00:00
Sunny Goyal
c5fb59fb9a
Fixing loadWorkspace being called multiple times
...
Using right intent when refreshing shortcut icons
Bug: 17662782
Bug: 17663766
Bug: 17569197
Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24
2014-09-26 01:07:11 +00:00
Baligh Uddin
090f9a6756
Import translations. DO NOT MERGE
...
Change-Id: I619612c919567fdaec3d7d0f5b9a33c94439c759
Auto-generated-cl: translation import
2014-09-25 11:44:09 -07:00
Sunny Goyal
f876301d0a
UI Fixes
...
> Adding a scrim to the longpress cling
Bug: 17573777
High level design asks (very low-risk)
> Changing the dialog to use device default theme
> Updating screenpanel assets
Change-Id: Ia0216b60fd8cd607d83a5e7c3d7e6c8255125eda
2014-09-23 16:33:26 -07:00
Adam Cohen
d8f6253e67
Merge "When ensuring screen exists, make sure it's actually referring to a screen, not a rank" into ub-now-porkchop
2014-09-20 06:45:54 +00:00
Baligh Uddin
68207e2532
Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
2014-09-20 04:22:31 +00:00
Adam Cohen
83079e43ae
When ensuring screen exists, make sure it's actually referring to a screen, not a rank
...
Bug: 17496589
Change-Id: If60e22dd71fa32530db91e37057689de5fb25646
2014-09-19 17:46:32 -07:00
Sunny Goyal
acefecbff3
Merge "Updating promise icon's bitmap and label when onBadgingChanged is received" into ub-now-porkchop
2014-09-19 19:58:07 +00:00
Sunny Goyal
7e053f8784
Merge "Changing intent action for auto installs" into ub-now-porkchop
2014-09-19 19:51:42 +00:00
Sunny Goyal
66af82cca7
Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
2014-09-19 19:50:26 +00:00
Sunny Goyal
2233c8850d
Changing intent action for auto installs
...
Bug: 17425805
Change-Id: I12e94860206ed62d6ba04f0b5734cc55ba414e45
2014-09-19 12:23:34 -07:00
Sunny Goyal
9448536b11
Adding support to delete unrestored icons and widgets
...
Bug: 17584719
Change-Id: If8e76fc80ea885c9004c50b7b6a9353525a50105
2014-09-19 12:19:07 -07:00
Sunny Goyal
a22666f681
Updating promise icon's bitmap and label when onBadgingChanged is received
...
Bug: 17583799
Change-Id: I68b4f9d4086c43bd949ad8b46b574ec78edb32db
2014-09-19 12:16:52 -07:00
Sunny Goyal
92e97dccab
Merge "Fix: First run cling shoud show 'Welcome' when there is no migration cling" into ub-now-porkchop
2014-09-19 18:02:25 +00:00
Sunny Goyal
af0628f84e
Fix: First run cling shoud show 'Welcome' when there is no migration cling
...
Bug: 17582926
Change-Id: I662e0ed9f12d237ee34a8f4540b339edee08c611
2014-09-19 10:59:35 -07:00
Adam Cohen
ddd5aaaf35
Merge "Perform null check in animation complete" into ub-now-porkchop
2014-09-18 15:19:40 +00:00
Adam Cohen
493f6bc142
Perform null check in animation complete
...
Bug 17561235
Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d
2014-09-18 08:14:05 -07:00
Kenny Guy
c0b89b72af
Merge "Update calls now we have an L API version." into ub-now-porkchop
2014-09-18 12:16:02 +00:00
Kenny Guy
d794a3f465
Update calls now we have an L API version.
...
Bug: 17543647
Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
2014-09-18 13:07:49 +01:00
Kenny Guy
850d471b29
Remove catch now api has hit googlefood.
...
Bug: 17543647
Change-Id: Ie0b57719393a705e8c02b226d3e3f57dbf43d800
2014-09-18 12:58:18 +01:00
Adam Cohen
83e5941d8e
Fix NPE in Workspace
...
Bug: 17503479
Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
2014-09-17 16:47:08 -07:00
Sunny Goyal
136882c195
Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop
2014-09-17 20:07:10 +00:00
Sunny Goyal
d8293fbf28
Merge "Null check in flushInvalidIcons" into ub-now-porkchop
2014-09-17 19:43:14 +00:00