OSDN Git Service
Adam Cohen [Thu, 19 Jun 2014 21:50:51 +0000 (14:50 -0700)]
Fix problem where launcher doesn't draw after rotation w/ translucent activity above it
-> Removed some code which caused this. The code was intended to fix a certain issue:
"Fixing issue where we were reverting to the first page of the workspace after
launching an application from all apps, rotating, and returning home"
-> That bug doesn't seem to occur anymore, even with the revert
-> See https://googleplex-android-review.googlesource.com/#/c/209561/1
issue
11808251
Change-Id: I14ada19a294d2e5139a9e650d55f1cd985dd00d3
Adam Cohen [Wed, 18 Jun 2014 17:34:58 +0000 (10:34 -0700)]
Prevent discordant state between Workspace and Launcher (issue
15409018)
Change-Id: I13bb3e51da18998a5dade49c50e5fbf2266022d3
Adam Cohen [Mon, 16 Jun 2014 22:22:56 +0000 (15:22 -0700)]
DO NOT MERGE - Catching TransactionTooLargeException in AppWidgetHost#startListening
solution b) from issue
14255011
Change-Id: I1dc521632a132de496ff9a583b1e0b29415aacdd
(cherry picked from commit
084c31873e5d5015dac9eaac722a6d8387b6dd8d)
Adam Cohen [Sat, 14 Jun 2014 02:11:57 +0000 (19:11 -0700)]
Fix NPE when dragging shortcut without component while app is uninstalled
issue
14601562
Change-Id: Icf0472d38c1b02de8421f146e26f2e2d79de43dd
Kenny Guy [Fri, 13 Jun 2014 20:56:51 +0000 (20:56 +0000)]
am
958315e8: Add catch for missing app icon resource.
* commit '
958315e8ef448641a75401acff1e4cb38fd776e7':
Add catch for missing app icon resource.
Kenny Guy [Tue, 27 May 2014 15:34:59 +0000 (16:34 +0100)]
Add catch for missing app icon resource.
The catch was present before moving the code into
the compat class.
Bug:
15276879
Change-Id: I81fbd49dacd813e861a2bc4f0b41dcbeccb9def2
(cherry picked from commit
c879052247b1000b9f318294024daa3c9d100621)
Adam Cohen [Fri, 13 Jun 2014 00:58:45 +0000 (17:58 -0700)]
Add method to check if there is a partner folder
Change-Id: I6154c731edfeb2a4fc0aed94f74a556059b5d103
Adam Cohen [Thu, 12 Jun 2014 21:54:41 +0000 (14:54 -0700)]
More defense for issue
14491953
Change-Id: I90de51c74e337d56aad891741233e6a857d89b62
Adam Cohen [Thu, 12 Jun 2014 19:29:50 +0000 (12:29 -0700)]
Add null check for empty MediaStore cursor
issue
15397853
Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8
Adam Cohen [Wed, 11 Jun 2014 18:57:39 +0000 (18:57 +0000)]
am
6ea3b116: Override app launch transition for LMP preview
* commit '
6ea3b116fc2eea7cc1a6892c548da45a4f581a1d':
Override app launch transition for LMP preview
Adam Cohen [Wed, 11 Jun 2014 18:38:49 +0000 (11:38 -0700)]
Override app launch transition for LMP preview
issue
15544569 j)
Change-Id: I8aff85a154cb98d865a8834f37b13e30cd03de6c
Adam Cohen [Wed, 11 Jun 2014 18:36:17 +0000 (18:36 +0000)]
am
71b0473f: Add new assets for LMP preview
* commit '
71b0473f24a7d77263aae88139f13298a1d64b27':
Add new assets for LMP preview
Adam Cohen [Wed, 11 Jun 2014 17:36:14 +0000 (10:36 -0700)]
Add new assets for LMP preview
issue
15544569 c), d), e)
Change-Id: Ib352ef1fa7c19c3695c82f3ea31936a4b41da5aa
Adam Cohen [Wed, 11 Jun 2014 17:37:53 +0000 (17:37 +0000)]
am
ada8d7df: Merge "Make folder stack more vertical for LMP preview" into ub-now-nova
* commit '
ada8d7dfe1a52eab1e2a0954cf369ed6d198de94':
Make folder stack more vertical for LMP preview
Adam Cohen [Wed, 11 Jun 2014 17:07:31 +0000 (17:07 +0000)]
am
a629f268: (-s ours) Merge "Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"" into ub-now-nova
* commit '
a629f26824c1f1b82cd6ecb5eb88df56eab6cdfe':
Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"
Adam Cohen [Wed, 11 Jun 2014 17:35:58 +0000 (17:35 +0000)]
Merge "Make folder stack more vertical for LMP preview" into ub-now-nova
Adam Cohen [Wed, 11 Jun 2014 01:56:22 +0000 (18:56 -0700)]
Make folder stack more vertical for LMP preview
issue
15544569 h)
Change-Id: Ie9830429f629db0963f5313d9e4c0c18b14bff4a
Adam Cohen [Wed, 11 Jun 2014 17:04:32 +0000 (17:04 +0000)]
Merge "Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"" into ub-now-nova
Adam Cohen [Mon, 9 Jun 2014 22:54:36 +0000 (22:54 +0000)]
Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"
This reverts commit
e1cdf5253d8c61218fe3b308803408c04f71ffa3.
Change-Id: If107c46fcc3062d990b0de9758045946c8017569
Adam Cohen [Mon, 9 Jun 2014 19:13:35 +0000 (19:13 +0000)]
am
aa4c8c1f: Fix for regression which made issue
14491953 occur more easily
* commit '
aa4c8c1fea577431e218a927ae8ba6c47e51bfdb':
Fix for regression which made issue
14491953 occur more easily
Adam Cohen [Fri, 6 Jun 2014 18:52:52 +0000 (11:52 -0700)]
Fix for regression which made issue
14491953 occur more easily
Change-Id: I27711aad8aae2824a54a043f686918d342ffc5bb
(cherry picked from commit
327acfea13d924293b88c7d204fde4a25748108d)
Adam Cohen [Fri, 6 Jun 2014 18:52:52 +0000 (11:52 -0700)]
Fix for regression which made issue
14491953 occur more easily
Change-Id: I27711aad8aae2824a54a043f686918d342ffc5bb
Adam Skory [Wed, 4 Jun 2014 17:13:49 +0000 (18:13 +0100)]
Squash unreachable catch
The compiler warning distracts me often.
Change-Id: I0192314f4ac9d8e3acb40dd10a39de297affcdac
Adam Cohen [Wed, 4 Jun 2014 05:28:54 +0000 (05:28 +0000)]
am
17937015: Add required cast
* commit '
179370154f5c5d63f683d44428bdbd1144d0102b':
Add required cast
Adam Cohen [Wed, 4 Jun 2014 05:23:28 +0000 (22:23 -0700)]
Add required cast
Change-Id: I6ff78f583777ec71d414d2fa66cce3390fd97d0e
Adam Cohen [Wed, 4 Jun 2014 05:09:37 +0000 (05:09 +0000)]
am
18bbc6a0: Adding workaround for issue with null drawable
* commit '
18bbc6a013e10b1fe384b7d3798622e087c813d2':
Adding workaround for issue with null drawable
Adam Cohen [Wed, 4 Jun 2014 04:43:24 +0000 (21:43 -0700)]
Adding workaround for issue with null drawable
A drawable is null which ought not be null, since it should have been set during inflation. Seems like a platform issue on one device. Adding a workaround to manually set it in code after inflation if necessary.
issue
15334203
Change-Id: Ideb80c231300e61f6dfe5336d6d647a3e1b51817
Adam Cohen [Wed, 4 Jun 2014 01:25:22 +0000 (01:25 +0000)]
am
e9a51198: Revert "Adding debugging and naive fix for issue
15334203"
* commit '
e9a5119836e5e3310c474cb4bb5b7a727bc2415f':
Revert "Adding debugging and naive fix for issue
15334203"
Adam Cohen [Wed, 4 Jun 2014 01:25:22 +0000 (01:25 +0000)]
am
ed11c140: Adding debugging and naive fix for issue
15334203
* commit '
ed11c14003ca4ae5f702b6eb3f6b5dd8f4e7d4a4':
Adding debugging and naive fix for issue
15334203
Adam Cohen [Wed, 4 Jun 2014 01:24:03 +0000 (01:24 +0000)]
Revert "Adding debugging and naive fix for issue
15334203"
This reverts commit
ed11c14003ca4ae5f702b6eb3f6b5dd8f4e7d4a4.
Change-Id: Ifc46769477e590512cc5ab79a69063c0341f52b2
Adam Cohen [Wed, 4 Jun 2014 01:03:29 +0000 (18:03 -0700)]
Adding debugging and naive fix for issue
15334203
-> To be reverted, just need signed build.
Change-Id: I6a83e55067d8d2564bb3c4f0c314befbb2793f09
Adam Cohen [Mon, 2 Jun 2014 21:09:10 +0000 (14:09 -0700)]
Removing some dead code / strings
issue
14161836
Change-Id: I44aa0c3109b1b0efe8e1be80eb4c4f373c02994a
Adam Cohen [Fri, 30 May 2014 22:34:09 +0000 (15:34 -0700)]
Adding ability for partners to specify a default layout
Change-Id: Ib071faa4b41d13961c3a33b865b40a644631c08a
Chris Wren [Fri, 30 May 2014 08:02:17 +0000 (08:02 +0000)]
am
3489f5c1: disable launcher restore by default, for nova launch
* commit '
3489f5c1bf0a3b036479b440b917123016568fc7':
disable launcher restore by default, for nova launch
Chris Wren [Thu, 29 May 2014 20:58:15 +0000 (16:58 -0400)]
disable launcher restore by default, for nova launch
Change-Id: I54aa2de71f8fcc660922a59ff280ae141e066f73
Kenny Guy [Tue, 27 May 2014 15:34:59 +0000 (16:34 +0100)]
Add catch for missing app icon resource.
The catch was present before moving the code into
the compat class.
Bug:
15276879
Change-Id: I81fbd49dacd813e861a2bc4f0b41dcbeccb9def2
Chris Wren [Fri, 23 May 2014 21:03:37 +0000 (21:03 +0000)]
am
58852b39: Log the component name for restored icons.
* commit '
58852b393bbfa0e2efd73186316cc3fa9592233a':
Log the component name for restored icons.
Chris Wren [Fri, 23 May 2014 20:56:53 +0000 (16:56 -0400)]
Log the component name for restored icons.
Bug:
15192063
Change-Id: I7d8aa05600a2278c18f3ac34f87b87b3867bcd0c
Adam Cohen [Fri, 23 May 2014 17:15:01 +0000 (17:15 +0000)]
am
9b1d062b: Make sure we can handle database downgrade (by wiping and starting fresh)
* commit '
9b1d062b0f1c4714883444df874e1a078764caa1':
Make sure we can handle database downgrade (by wiping and starting fresh)
Adam Cohen [Thu, 22 May 2014 02:01:57 +0000 (19:01 -0700)]
Make sure we can handle database downgrade (by wiping and starting fresh)
issue
15144138
Change-Id: I59aad7445d2aaaaede1cba6754e047f05a2859ae
Adam Cohen [Thu, 22 May 2014 00:30:09 +0000 (00:30 +0000)]
am
ea90f83e: Check before suggesting default wallpaper dimensions
* commit '
ea90f83e248086b91dbbc7969059f6887190b2a2':
Check before suggesting default wallpaper dimensions
Adam Cohen [Wed, 21 May 2014 22:03:34 +0000 (15:03 -0700)]
Check before suggesting default wallpaper dimensions
issue
14470153
Change-Id: Id00e9cb4bd2b769818ed61de65be8c1c0119e07d
Adam Cohen [Wed, 21 May 2014 23:01:58 +0000 (23:01 +0000)]
am
73859adf: Merge "Revert "Debugging wallpaper stuff on production device (to be reverted once built)"" into ub-now-nova
* commit '
73859adf80c94a377508a1d9ea8b6fa45a19f80f':
Revert "Debugging wallpaper stuff on production device (to be reverted once built)"
Adam Cohen [Wed, 21 May 2014 23:01:57 +0000 (23:01 +0000)]
am
00a019d9: Merge "Debugging wallpaper stuff on production device (to be reverted once built)" into ub-now-nova
* commit '
00a019d9e5713a595e6528d985174e4dff454445':
Debugging wallpaper stuff on production device (to be reverted once built)
Adam Cohen [Wed, 21 May 2014 23:01:31 +0000 (23:01 +0000)]
Merge "Revert "Debugging wallpaper stuff on production device (to be reverted once built)"" into ub-now-nova
Adam Cohen [Wed, 21 May 2014 23:01:25 +0000 (23:01 +0000)]
Revert "Debugging wallpaper stuff on production device (to be reverted once built)"
This reverts commit
f8dc557cf84ad90186e94d1ebe15f850a6edf2a0.
Change-Id: I2a2ce9a067ec6df829eb23997661bb090daa64ff
Adam Cohen [Wed, 21 May 2014 23:00:01 +0000 (23:00 +0000)]
Merge "Debugging wallpaper stuff on production device (to be reverted once built)" into ub-now-nova
Adam Cohen [Wed, 21 May 2014 22:49:31 +0000 (15:49 -0700)]
Debugging wallpaper stuff on production device (to be reverted once built)
issue
14470153
Change-Id: I6c93b11f639d79163da0c3ce4e4053e304e0081e
Sandeep Siddhartha [Wed, 21 May 2014 22:46:34 +0000 (22:46 +0000)]
am
e1cdf525: (-s ours) Revert transparent bars for L in 3.5. DO NOT MERGE
* commit '
e1cdf5253d8c61218fe3b308803408c04f71ffa3':
Revert transparent bars for L in 3.5. DO NOT MERGE
Sandeep Siddhartha [Wed, 21 May 2014 22:07:15 +0000 (15:07 -0700)]
Revert transparent bars for L in 3.5. DO NOT MERGE
Bug:
15082937
Change-Id: I7698744aae83e58902641cf1fcc6ab55c1fcb543
Adam Cohen [Wed, 21 May 2014 00:55:50 +0000 (00:55 +0000)]
am
a28b78e8: Fix issue where shortcuts were still being added even if corresponding app is uninstalled
* commit '
a28b78e8385f0f590b144038157afc7d34cd48b7':
Fix issue where shortcuts were still being added even if corresponding app is uninstalled
Adam Cohen [Wed, 21 May 2014 00:03:04 +0000 (17:03 -0700)]
Fix issue where shortcuts were still being added even if corresponding app is uninstalled
issue
14410162
Change-Id: I7857aace069c4eb4c1ee504088f4526d61e1f30e
Adam Cohen [Tue, 20 May 2014 22:30:11 +0000 (22:30 +0000)]
am
7716b400: Merge "Fix crash when launcher dies while configuring a widget / shortcut" into ub-now-nova
* commit '
7716b400654bae009188daf9053b68727410a53d':
Fix crash when launcher dies while configuring a widget / shortcut
Adam Cohen [Tue, 20 May 2014 22:26:49 +0000 (22:26 +0000)]
Merge "Fix crash when launcher dies while configuring a widget / shortcut" into ub-now-nova
Adam Cohen [Tue, 20 May 2014 21:23:40 +0000 (14:23 -0700)]
Fix crash when launcher dies while configuring a widget / shortcut
issue
15014018
Change-Id: I083fa40fb2fd0eb217852e5d088fa5e18e5f5697
Adam Cohen [Tue, 20 May 2014 00:44:37 +0000 (00:44 +0000)]
am
dedfca2a: Preventing crash when hovering over folder icon with widget shortcut
* commit '
dedfca2aef7573624bdb421b1805ef5e04bee502':
Preventing crash when hovering over folder icon with widget shortcut
Adam Cohen [Mon, 19 May 2014 22:10:39 +0000 (15:10 -0700)]
Preventing crash when hovering over folder icon with widget shortcut
issue
13748105
Change-Id: I053f6c7748310ad117ec216655e6147bfe6e4f85
Adam Cohen [Mon, 19 May 2014 21:17:11 +0000 (21:17 +0000)]
am
5eed5d8c: Ensure that hotseat callout only occurs when appropriate
* commit '
5eed5d8c7b7ca78dd07bc6d441600cb97e0782a1':
Ensure that hotseat callout only occurs when appropriate
Adam Cohen [Mon, 19 May 2014 20:12:13 +0000 (13:12 -0700)]
Ensure that hotseat callout only occurs when appropriate
issue
13551957
Change-Id: I87bda7eef8047edbd41f066930ed156a17d042df
Sandeep Siddhartha [Mon, 19 May 2014 18:51:04 +0000 (18:51 +0000)]
am
876b0039: Remove unnecessary reflection
* commit '
876b003901afe908f46b47feef72afec576387bf':
Remove unnecessary reflection
Sandeep Siddhartha [Mon, 19 May 2014 18:45:01 +0000 (11:45 -0700)]
Remove unnecessary reflection
Change-Id: Ia8a31eaf8563c4a337040e794742275c7e044506
Adam Cohen [Sun, 18 May 2014 03:19:40 +0000 (03:19 +0000)]
am
c29217b0: Revert "Debugging something for wallpaper noise issue"
* commit '
c29217b08f3e7994876733ad1cf45bc03618f3a6':
Revert "Debugging something for wallpaper noise issue"
Adam Cohen [Sun, 18 May 2014 03:17:15 +0000 (03:17 +0000)]
Revert "Debugging something for wallpaper noise issue"
This reverts commit
211d38c784a2211ba6d1d9bcdf3c3bb1cf396d72.
Change-Id: I2c3e69e8951c3435f51d9ac43eddf0b56157b792
Adam Cohen [Sun, 18 May 2014 01:20:17 +0000 (01:20 +0000)]
am
211d38c7: Debugging something for wallpaper noise issue
* commit '
211d38c784a2211ba6d1d9bcdf3c3bb1cf396d72':
Debugging something for wallpaper noise issue
Adam Cohen [Sat, 17 May 2014 02:41:40 +0000 (19:41 -0700)]
Debugging something for wallpaper noise issue
issue
14470153
Change-Id: Ifdde30b9a26443cdcf480f0ed4cfed2d612d09cf
Adam Cohen [Sat, 17 May 2014 01:29:26 +0000 (01:29 +0000)]
am
8457d491: Removing extra clear, load and bind of default workspace
* commit '
8457d491bf1f3989ea2cf58f20b0ff4863a668a7':
Removing extra clear, load and bind of default workspace
Adam Cohen [Sat, 17 May 2014 00:05:49 +0000 (17:05 -0700)]
Removing extra clear, load and bind of default workspace
-> If the user clicks "start fresh" we don't need to reload the workspace
since we've already loaded the default workspace from the primary
load in onCreate.
Change-Id: I43cb9e66fd49403ab6e0723cab1a03edd3dcac1b
Adam Cohen [Sat, 17 May 2014 01:21:19 +0000 (01:21 +0000)]
am
57884c7e: Merge "Disable the folder cling in two cases" into ub-now-nova
* commit '
57884c7ee2835df52913a87ad90e83293c3157d3':
Disable the folder cling in two cases
Adam Cohen [Sat, 17 May 2014 01:18:44 +0000 (01:18 +0000)]
Merge "Disable the folder cling in two cases" into ub-now-nova
Adam Cohen [Fri, 16 May 2014 23:42:35 +0000 (16:42 -0700)]
Disable the folder cling in two cases
-> When the user creates a new folder
-> When the user drags an existing folder
-> The folder cling gets cut off in certain instances
and until we make it more extensible (not worth
it right now), we're disabling it in the problematic
cases. Also, in the problematic cases, the user
is demonstrating some advanced knowledge, so
it's somewhat justifiable.
issue
14491765
Change-Id: Ib15d2f097c51a9b755f04b95ed6ef468d3bacc60
Sandeep Siddhartha [Sat, 17 May 2014 01:09:10 +0000 (01:09 +0000)]
am
1a86ac56: Merge "Use transparent system bars on L" into ub-now-nova
* commit '
1a86ac56d73762773d67a85ebe0c33faddcc4798':
Use transparent system bars on L
Sandeep Siddhartha [Sat, 17 May 2014 01:06:56 +0000 (01:06 +0000)]
Merge "Use transparent system bars on L" into ub-now-nova
Sandeep Siddhartha [Sat, 17 May 2014 00:21:15 +0000 (17:21 -0700)]
Use transparent system bars on L
Change-Id: I1e8921fa0e8a5bdf34495f9d88ba9f3b1f1e9c89
Jason Monk [Fri, 16 May 2014 22:10:09 +0000 (22:10 +0000)]
am
bbe1e24c: Fix issue where always trying to migrate
* commit '
bbe1e24c5ff470a695510d23d67bcb6f2ad88d0e':
Fix issue where always trying to migrate
Jason Monk [Fri, 16 May 2014 21:37:34 +0000 (17:37 -0400)]
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
Winson Chung [Fri, 16 May 2014 19:43:59 +0000 (19:43 +0000)]
am
dbc46f5e: Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
* commit '
dbc46f5e05d035524eff7fb1ea3ac8681b6b673a':
Adding support for dynamically resolved default layouts.
Winson Chung [Fri, 16 May 2014 19:42:03 +0000 (19:42 +0000)]
Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
Adam Cohen [Fri, 16 May 2014 19:40:32 +0000 (19:40 +0000)]
am
ca853c4a: Merge "Removing antiquated migration path logic" into ub-now-nova
* commit '
ca853c4a351991c3be8b0939733990d88249a61e':
Removing antiquated migration path logic
Adam Cohen [Fri, 16 May 2014 19:37:32 +0000 (19:37 +0000)]
Merge "Removing antiquated migration path logic" into ub-now-nova
Winson Chung [Wed, 14 May 2014 21:15:20 +0000 (14:15 -0700)]
Adding support for dynamically resolved default layouts.
Change-Id: Id05c60b93423ce37dd06a126ecf33c74a0ba1d62
Adam Cohen [Thu, 15 May 2014 21:04:01 +0000 (14:04 -0700)]
Removing antiquated migration path logic
-> also added some extra debugging for issue
14466459
Change-Id: I1ac9352c52c15d3e37f945cffabbca49343d2b8f
Sameer Padala [Fri, 16 May 2014 19:17:03 +0000 (19:17 +0000)]
am
e6203a4d: Merge "Fix build" into ub-now-nova
* commit '
e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7':
Fix build
Sameer Padala [Fri, 16 May 2014 19:15:10 +0000 (19:15 +0000)]
Merge "Fix build" into ub-now-nova
Sameer Padala [Fri, 16 May 2014 19:01:25 +0000 (19:01 +0000)]
Fix build
Revert "Adding support for dynamically resolved default layouts."
This reverts commit
667e4d395ca17de2b5bb0ec74202ee8f0673d894.
Change-Id: I1b4b900fa3551f9fe9ec938b89efa5a208001234
Winson Chung [Fri, 16 May 2014 18:27:14 +0000 (18:27 +0000)]
am
6df24b77: Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
* commit '
6df24b7793b744055e4e388bc75ebb5c9f34cbe8':
Adding support for dynamically resolved default layouts.
Winson Chung [Fri, 16 May 2014 18:24:42 +0000 (18:24 +0000)]
Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
Winson Chung [Wed, 14 May 2014 21:15:20 +0000 (14:15 -0700)]
Adding support for dynamically resolved default layouts.
issue
14159482
Change-Id: Ic24c5e425cf3e427b82dd13a4a78dd9108174599
Kenny Guy [Fri, 16 May 2014 12:08:06 +0000 (12:08 +0000)]
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.
Kenny Guy [Fri, 16 May 2014 12:06:00 +0000 (12:06 +0000)]
Merge "Reset profile ids when backing up / restoring favorites." into ub-now-nova
Baligh Uddin [Thu, 15 May 2014 14:37:18 +0000 (14:37 +0000)]
am
97dd8c21: (-s ours) am
591f23a6: (-s ours) Import translations. DO NOT MERGE
* commit '
97dd8c21efa751ebcaeaf4f10f40450bfa245f69':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 May 2014 14:33:55 +0000 (14:33 +0000)]
am
591f23a6: (-s ours) Import translations. DO NOT MERGE
* commit '
591f23a6aff66d452e34e6aed6a164028d9326bd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 May 2014 00:27:57 +0000 (17:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic897d7848f4c86fbfd117fbe5ca6d9a670383bbd
Auto-generated-cl: translation import
Chris Wren [Wed, 14 May 2014 15:05:18 +0000 (15:05 +0000)]
am
efaf8a3d: remove work around for bug
14891460. Bug:
14895464
* commit '
efaf8a3dcde8158f50e5db36a7e81207b9978863':
remove work around for bug
14891460. Bug:
14895464
Chris Wren [Wed, 14 May 2014 14:03:07 +0000 (10:03 -0400)]
remove work around for bug
14891460.
Bug:
14895464
Change-Id: I1e923e4fca194cde19195d156e33e99fc9fe86b6
Kenny Guy [Wed, 14 May 2014 12:48:55 +0000 (12:48 +0000)]
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.
Kenny Guy [Wed, 14 May 2014 12:45:54 +0000 (12:45 +0000)]
Merge "Return null from compat when resolveActivity returns null." into ub-now-nova
Kenny Guy [Wed, 14 May 2014 11:06:51 +0000 (12:06 +0100)]
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
Adrian Roos [Wed, 14 May 2014 11:24:01 +0000 (11:24 +0000)]
am
0c281862: Merge "Fix NPE in WidgetPreviewLoader" into ub-now-nova
* commit '
0c28186282d0f48ab7350904918c940639a9b542':
Fix NPE in WidgetPreviewLoader
Adrian Roos [Wed, 14 May 2014 11:21:53 +0000 (11:21 +0000)]
Merge "Fix NPE in WidgetPreviewLoader" into ub-now-nova
Adrian Roos [Mon, 12 May 2014 13:59:59 +0000 (15:59 +0200)]
Fix NPE in WidgetPreviewLoader
Change-Id: Ic746f2a5e4237a9ea82abf5f9532307d40432ac1