Jason Monk
bbe1e24c5f
Fix issue where always trying to migrate
...
Rather than check if the ContentProviderClient is null (which fails
in when using the Redirector), check the PackageManager directly
for the authority we are looking for.
Bug: 14466459
Change-Id: I7420352a15dcea5037196670f18705e7a34f0672
2014-05-16 18:02:21 -04:00
Winson Chung
f9402907e9
am dbc46f5e: Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
...
* commit 'dbc46f5e05d035524eff7fb1ea3ac8681b6b673a':
Adding support for dynamically resolved default layouts.
2014-05-16 19:43:59 +00:00
Winson Chung
dbc46f5e05
Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
2014-05-16 19:42:03 +00:00
Adam Cohen
de23ec9bc1
am ca853c4a: Merge "Removing antiquated migration path logic" into ub-now-nova
...
* commit 'ca853c4a351991c3be8b0939733990d88249a61e':
Removing antiquated migration path logic
2014-05-16 19:40:32 +00:00
Adam Cohen
ca853c4a35
Merge "Removing antiquated migration path logic" into ub-now-nova
2014-05-16 19:37:32 +00:00
Winson Chung
be87647e2a
Adding support for dynamically resolved default layouts.
...
Change-Id: Id05c60b93423ce37dd06a126ecf33c74a0ba1d62
2014-05-16 12:33:38 -07:00
Adam Cohen
71483f417b
Removing antiquated migration path logic
...
-> also added some extra debugging for issue 14466459
Change-Id: I1ac9352c52c15d3e37f945cffabbca49343d2b8f
2014-05-16 12:26:36 -07:00
Sameer Padala
de5cd2f5bd
am e6203a4d: Merge "Fix build" into ub-now-nova
...
* commit 'e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7':
Fix build
2014-05-16 19:17:03 +00:00
Sameer Padala
e6203a4d30
Merge "Fix build" into ub-now-nova
2014-05-16 19:15:17 +00:00
Sameer Padala
66311fda41
Fix build
...
Revert "Adding support for dynamically resolved default layouts."
This reverts commit 667e4d395c .
Change-Id: I1b4b900fa3551f9fe9ec938b89efa5a208001234
2014-05-16 19:02:23 +00:00
Winson Chung
82b1dedac9
am 6df24b77: Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
...
* commit '6df24b7793b744055e4e388bc75ebb5c9f34cbe8':
Adding support for dynamically resolved default layouts.
2014-05-16 18:27:14 +00:00
Winson Chung
6df24b7793
Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
2014-05-16 18:24:43 +00:00
Winson Chung
667e4d395c
Adding support for dynamically resolved default layouts.
...
issue 14159482
Change-Id: Ic24c5e425cf3e427b82dd13a4a78dd9108174599
2014-05-16 17:26:09 +00:00
Kenny Guy
b6feb20866
am 7cfce946: Merge "Reset profile ids when backing up / restoring favorites." into ub-now-nova
...
* commit '7cfce9464e40fbd1e7b6308d6356da27a7082c81':
Reset profile ids when backing up / restoring favorites.
2014-05-16 12:08:06 +00:00
Kenny Guy
7cfce9464e
Merge "Reset profile ids when backing up / restoring favorites." into ub-now-nova
2014-05-16 12:06:01 +00:00
Baligh Uddin
30f9cd1e8a
am 97dd8c21: (-s ours) am 591f23a6: (-s ours) Import translations. DO NOT MERGE
...
* commit '97dd8c21efa751ebcaeaf4f10f40450bfa245f69':
Import translations. DO NOT MERGE
2014-05-15 14:37:18 +00:00
Baligh Uddin
97dd8c21ef
am 591f23a6: (-s ours) Import translations. DO NOT MERGE
...
* commit '591f23a6aff66d452e34e6aed6a164028d9326bd':
Import translations. DO NOT MERGE
2014-05-15 14:33:55 +00:00
Baligh Uddin
591f23a6af
Import translations. DO NOT MERGE
...
Change-Id: Ic897d7848f4c86fbfd117fbe5ca6d9a670383bbd
Auto-generated-cl: translation import
2014-05-14 17:27:57 -07:00
Chris Wren
437e60bc76
am efaf8a3d: remove work around for bug 14891460. Bug: 14895464
...
* commit 'efaf8a3dcde8158f50e5db36a7e81207b9978863':
remove work around for bug 14891460. Bug: 14895464
2014-05-14 15:05:18 +00:00
Chris Wren
efaf8a3dcd
remove work around for bug 14891460.
...
Bug: 14895464
Change-Id: I1e923e4fca194cde19195d156e33e99fc9fe86b6
2014-05-14 10:03:07 -04:00
Kenny Guy
d12f7f0b49
am 43118986: Merge "Return null from compat when resolveActivity returns null." into ub-now-nova
...
* commit '43118986caea9b66ee96b8127e14c84609b3e02f':
Return null from compat when resolveActivity returns null.
2014-05-14 12:48:55 +00:00
Kenny Guy
43118986ca
Merge "Return null from compat when resolveActivity returns null." into ub-now-nova
2014-05-14 12:45:54 +00:00
Kenny Guy
792dd77e8c
Return null from compat when resolveActivity returns null.
...
Fixes bug that LauncherAppsCompatVL.resolveActivity was wrapping
a null in a compat class when LauncherApps.resolveActivity returns
null.
Bug: 14891460
Change-Id: I0364b198486f14393e51ac383a9d10b89e466bdf
2014-05-14 13:16:07 +01:00
Adrian Roos
bf58010a54
am 0c281862: Merge "Fix NPE in WidgetPreviewLoader" into ub-now-nova
...
* commit '0c28186282d0f48ab7350904918c940639a9b542':
Fix NPE in WidgetPreviewLoader
2014-05-14 11:24:01 +00:00
Adrian Roos
0c28186282
Merge "Fix NPE in WidgetPreviewLoader" into ub-now-nova
2014-05-14 11:21:53 +00:00
Adrian Roos
fa9ffc28fd
Fix NPE in WidgetPreviewLoader
...
Change-Id: Ic746f2a5e4237a9ea82abf5f9532307d40432ac1
2014-05-14 13:06:47 +02:00
Chris Wren
507df5a023
am 244637b5: Merge "work around bug in LauncherAppsCompat to find restored icons" into ub-now-nova
...
* commit '244637b59c328b918c6b2e1aef33ba448728207d':
work around bug in LauncherAppsCompat to find restored icons
2014-05-13 21:59:42 +00:00
Chris Wren
244637b59c
Merge "work around bug in LauncherAppsCompat to find restored icons" into ub-now-nova
2014-05-13 21:55:13 +00:00
Chris Wren
075f9f5b66
work around bug in LauncherAppsCompat to find restored icons
...
Bug: 14895464
Change-Id: Iff4f1a9a2e8edf789231be7a1c20e277e18eb05c
2014-05-13 16:18:21 -04:00
Kenny Guy
7e8ddd0c13
am c2a2c623: Merge "Don\'t clear flags in startActivity" into ub-now-nova
...
* commit 'c2a2c6238d7bc337f047880166181794b2b9e520':
Don't clear flags in startActivity
2014-05-13 19:37:59 +00:00
Baligh Uddin
741e29b5a2
am 56924a82: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
...
* commit '56924a822d3e96a4ef9038f1f34750c216c6e438':
Import translations. DO NOT MERGE
2014-05-13 19:37:52 +00:00
Chris Wren
7628b693a1
am 418dcb88: Merge "check for long and short component names." into ub-now-nova
...
* commit '418dcb881a62162b2834321d362c2f8f01962493':
check for long and short component names.
2014-05-13 19:17:28 +00:00
Adam Cohen
322a5e7e93
am e0aaa0d3: Remove antiquated way of determining CellInfo during long press
...
* commit 'e0aaa0d3de0eedf5501fee762e0d8279a9e3bc3c':
Remove antiquated way of determining CellInfo during long press
2014-05-13 19:17:28 +00:00
Kenny Guy
c2a2c6238d
Merge "Don't clear flags in startActivity" into ub-now-nova
2014-05-13 16:28:40 +00:00
Baligh Uddin
56924a822d
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-05-13 15:53:17 +00:00
Kenny Guy
b6cc40bc15
Don't clear flags in startActivity
...
Move setting flags for starting apps back to
AppInfo from Launcher.startActivity.
Bug: 14839470
Change-Id: I1dc928e9ebce9ce4d411678f94b5ca4284c1255f
2014-05-13 15:58:58 +01:00
Kenny Guy
f8b1dfd293
Reset profile ids when backing up / restoring favorites.
...
Clear the profile id when packing an intent for backup.
Set the profile id to the current user when restoring
a favorite from a backup.
Change-Id: I9d976fbe16773b34a74e57d080ff797ba51f9b04
2014-05-13 13:02:21 +01:00
Chris Wren
418dcb881a
Merge "check for long and short component names." into ub-now-nova
2014-05-12 20:46:39 +00:00
Chris Wren
0e584b5802
check for long and short component names.
...
Bug: 14650346
Change-Id: Ic2195a4f60b63f8ec85c42284e0fd58d6f473a9f
2014-05-12 16:10:46 -04:00
Baligh Uddin
e2e9c4384f
Import translations. DO NOT MERGE
...
Change-Id: If0e29141f43f95b704036c10181eef2a399eab1f
Auto-generated-cl: translation import
2014-05-12 12:57:32 -07:00
Baligh Uddin
abacb65d74
Import translations. DO NOT MERGE
...
Change-Id: I3653faf634f0378a81a6acd75fa055ca10962b88
Auto-generated-cl: translation import
2014-05-12 12:57:03 -07:00
Adam Cohen
e0aaa0d3de
Remove antiquated way of determining CellInfo during long press
...
-> allows us to eliminate cast of getTag() to CellInfo to fix
issue 13587508
Change-Id: Id2277206765621f664b758cce800bf8423231b1e
2014-05-12 12:45:59 -07:00
Kenny Guy
55e39a7813
am a1f26fdb: Merge "Fix missing space in select statement in backup helper." into ub-now-nova
...
* commit 'a1f26fdb50862abe55f648925d0b07dfd28d8208':
Fix missing space in select statement in backup helper.
2014-05-12 11:53:12 +00:00
Kenny Guy
a1f26fdb50
Merge "Fix missing space in select statement in backup helper." into ub-now-nova
2014-05-12 11:50:19 +00:00
Adam Cohen
cf1c711bd6
am e1c92c4a: Remove debug println
...
* commit 'e1c92c4afa7df98c13c3f57986f6f44ffe8ce952':
Remove debug println
2014-05-09 23:51:17 +00:00
Adam Cohen
e1c92c4afa
Remove debug println
...
Change-Id: I8bf8f948394ed2ecbcb3da3761506c9aa5752494
2014-05-09 16:40:59 -07:00
Adam Cohen
d858549cba
am 689ff16e: Cleanup pattern for removing the extra empty screen after drag operations
...
* commit '689ff16ea27fb7c22c247aaf4f42ffe42fede253':
Cleanup pattern for removing the extra empty screen after drag operations
2014-05-09 22:27:23 +00:00
Adam Cohen
689ff16ea2
Cleanup pattern for removing the extra empty screen after drag operations
...
-> Fixes a couple bugs: issue 12179908, issue 12372657, issue 13287732
Change-Id: I24b5abe8e432ea331eeb77407120a8cec28f6376
2014-05-09 15:05:53 -07:00
Kenny Guy
43ea7ac8ad
Fix missing space in select statement in backup helper.
...
Also check when backing up favourites that they are
for current user.
Change-Id: Ic9d496c30612ee531fa84a22f852b3012df00b4f
2014-05-09 18:05:29 +01:00
Kenny Guy
617d092852
am 1317e2dd: Fix bug with user of shortcut not being remembered over restart.
...
* commit '1317e2dd4a2fb097d1e54759536d515fdeca2c3e':
Fix bug with user of shortcut not being remembered over restart.
2014-05-09 11:13:43 +00:00