Dan Sandler
947ef4e7ab
am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit
...
* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
Defend against missing DB during migration.
2014-01-24 21:02:03 -08:00
Dan Sandler
7a9cda18eb
Merge "Defend against missing DB during migration." into jb-ub-now-kermit
2014-01-25 05:00:33 +00:00
Michael Jurka
523e762ad4
Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox
2014-01-24 12:04:45 +00:00
Winson Chung
d6467b98e8
am 2aaf6e33: Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit
...
* commit '2aaf6e339000646501bc3d73e497a365174fad26':
Adding tighter first run checks for migration clings. (Bug 12626290)
2014-01-23 12:23:35 -08:00
Winson Chung
2aaf6e3390
Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit
2014-01-23 20:21:12 +00:00
Baligh Uddin
747ef2baf0
am c2abb6b4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c2abb6b443592cd1d070e2fa196511e2f6957077':
Import translations. DO NOT MERGE
2014-01-23 10:41:40 -08:00
Baligh Uddin
4635a40596
Import translations. DO NOT MERGE
...
Change-Id: I2e2a6f98fd63d04c55e08e0c11d256105701457a
Auto-generated-cl: translation import
2014-01-23 10:28:57 -08:00
Baligh Uddin
c2abb6b443
Import translations. DO NOT MERGE
...
Change-Id: I9a8480fdd1e29c679711c256f4e2a0d2d0687c36
Auto-generated-cl: translation import
2014-01-23 10:26:35 -08:00
Michael Jurka
b1f50d70e9
Catch exceptions if Exif is malformed
...
Bug: 11650650
Change-Id: Iee8f1675850c692fe54dc619f3e969ba180e4206
2014-01-23 15:26:50 +01:00
Michael Jurka
391f1a8062
Merge "Disable Set Wallpaper button while loading image" into ub-now-lunchbox
2014-01-23 13:22:29 +00:00
Ian Parkinson
4195da42b7
am 94449158: Avoid NPE from delayed Runnable
...
* commit '944491587e8a8f77233a1916cc16cd07edd97f2e':
Avoid NPE from delayed Runnable
2014-01-22 11:32:47 -08:00
Winson Chung
0b560dda27
Adding tighter first run checks for migration clings. (Bug 12626290)
...
Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
2014-01-21 13:00:26 -08:00
Dan Sandler
2b4717447e
Defend against missing DB during migration.
...
Bug: 12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
2014-01-21 14:14:41 -05:00
Ian Parkinson
944491587e
Avoid NPE from delayed Runnable
...
Naive fix to b/12656485. Other Runnables in Launcher similarly check
that mWorkspace hasn't become null between being posted and being
executed, so I think this is probably appropriate.
Bug: 12656485
Change-Id: Ib4f3d0e8686c6249fe838144b1e8120c85f66f01
2014-01-21 13:09:59 +00:00
Adam Cohen
f488644c2c
am a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit
...
* commit 'a4db090b1345038a89a38ba8af6ac74f71e2ed7c':
Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
2014-01-17 16:23:19 -08:00
Adam Cohen
a4db090b13
Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit
2014-01-18 00:21:57 +00:00
Winson Chung
3abfd16e5d
Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
...
Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
2014-01-17 14:43:02 -08:00
Adam Cohen
0d5de13425
am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
...
* commit '5ac62d6914067c48e1fcdb3f6f149532017c5803':
Fix overlapping pages (issue 12551580)
2014-01-17 14:34:19 -08:00
Adam Cohen
5ac62d6914
Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
2014-01-17 22:32:22 +00:00
Adam Cohen
c07347961e
am e6e0af03: Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit
...
* commit 'e6e0af03ee39b3e800c8f7e86eefffae432ee7c8':
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 13:28:54 -08:00
Adam Cohen
e6e0af03ee
Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit
2014-01-17 20:25:14 +00:00
Winson Chung
e029874bcf
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 12:03:00 -08:00
Michael Jurka
849aff7553
Disable Set Wallpaper button while loading image
...
Bug: 12472111
Change-Id: I2a0cba47f31af2416b0dd062929f277fcbf80481
2014-01-17 13:30:11 +01:00
Adam Cohen
efb31e399d
Fix overlapping pages (issue 12551580)
...
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
2014-01-16 16:09:05 -08:00
Selim Cinek
f3a8e8c0bd
Disabled the wallpaper when completely in -1 Now space.
...
Bug: 11186234
Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
2014-01-16 23:57:27 +00:00
Winson Chung
cdd82ef1bb
am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
...
* commit 'f8584042713aad82f9d057ecaace8a9ad1aad0bc':
Updating Tablet clings. (Bug 11973614)
2014-01-16 15:10:51 -08:00
Winson Chung
ce46ad2add
am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit
...
* commit '1ba0a30e6545a8c313d0ef355a101f661bbf778c':
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
2014-01-16 15:07:35 -08:00
Adam Cohen
5a02d4c325
am 08101b1f: Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
...
* commit '08101b1f52b2b6aa8ddb82f09a18b91482b99f58':
Lazy load the widget preview loader class
2014-01-16 15:07:34 -08:00
Winson Chung
f858404271
Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
2014-01-16 23:07:02 +00:00
Winson Chung
1ba0a30e65
Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit
2014-01-16 23:06:29 +00:00
Adam Cohen
08101b1f52
Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
2014-01-16 23:05:00 +00:00
Winson Chung
88eefe43bf
am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit
...
* commit 'e1b0682af062bc85b7328f5c635a21d9ce420d8e':
Updating screen background assets. (Bug 12136457)
2014-01-16 14:50:25 -08:00
Winson Chung
e1b0682af0
Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit
2014-01-16 22:48:33 +00:00
Winson Chung
6d110117be
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
...
Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
2014-01-16 14:47:53 -08:00
Winson Chung
fd0394cc6d
Updating screen background assets. (Bug 12136457)
...
Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
2014-01-16 14:41:21 -08:00
Winson Chung
205cd7727f
Updating Tablet clings. (Bug 11973614)
...
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
2014-01-16 14:26:07 -08:00
Adam Cohen
99cc975271
am 72960975: Migration update: ensuring all folders go first
...
* commit '72960975d8367e7ce789d8a5b6f0763fb0ec78bf':
Migration update: ensuring all folders go first
2014-01-16 11:59:19 -08:00
Adam Cohen
72960975d8
Migration update: ensuring all folders go first
...
-> Also, leave the last row empty on every screen
-> Fix bug where shortcuts weren't getting moved (introduced in
previous CL)
-> Only dedupe items directly on the workspace
Bug 12416411
Bug 12572727
Change-Id: Id95cc6081c57cc289c2a85b2a6872ee0bf3eb98a
2014-01-16 11:56:41 -08:00
Adam Cohen
2760274df3
am 556f6135: Don\'t migrate shortcuts for components that no longer exist
...
* commit '556f6135f992dcd5bfbfffe0172627bfbf57d24e':
Don't migrate shortcuts for components that no longer exist
2014-01-16 11:20:19 -08:00
Michael Jurka
9c5cc5a893
Lazy load the widget preview loader class
...
Bug: 12109621
Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
2014-01-16 13:34:55 +01:00
Adam Cohen
556f6135f9
Don't migrate shortcuts for components that no longer exist
...
Bug 12570791
Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
2014-01-15 23:32:46 +00:00
Adrian Roos
aa5113a446
Merge "Fix back button behavior for "App info" when launched by Launcher3." into ub-now-lunchbox
2014-01-15 23:18:24 +00:00
Chris Wren
e6f4bf642f
am 230cbf83: Merge "rationalize launcher backup logging" into jb-ub-now-kermit
...
* commit '230cbf831cbbe8aaa6eaff976f755a8adf5e1708':
rationalize launcher backup logging
2014-01-15 15:03:10 -08:00
Chris Wren
230cbf831c
Merge "rationalize launcher backup logging" into jb-ub-now-kermit
2014-01-15 22:09:20 +00:00
Geoff Mendal
3992735e00
am 43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
...
* commit '43323cc306adaae144457f29c0b0860d4f21f257':
Import translations. DO NOT MERGE
2014-01-15 14:09:10 -08:00
Geoff Mendal
fbc17c9e2f
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
2014-01-15 22:05:06 +00:00
Geoff Mendal
43323cc306
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
2014-01-15 22:04:16 +00:00
Geoff Mendal
3b0d0a6bd3
Import translations. DO NOT MERGE
...
Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d
Auto-generated-cl: translation import
2014-01-15 13:56:06 -08:00
Geoff Mendal
0c04bfae09
Import translations. DO NOT MERGE
...
Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
2014-01-15 13:52:37 -08:00
Chris Wren
50c8f42568
rationalize launcher backup logging
...
enough data to debug dogfood issues
easy switch to move to quieter production mode
common switch across all three classes
Bug: 12545310
Change-Id: Icb4ad7174f20884c6993140149db590d66f6e006
2014-01-15 16:35:33 -05:00