523e762ad4
Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox
2014-01-24 12:04:45 +00:00
6a996e7d34
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
2014-01-23 14:36:56 -08:00
0c990d4b9d
am d6467b98: am 2aaf6e33: Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit
...
* commit 'd6467b98e8ac64f3b31e77bea83f5d3b7f7d118a':
Adding tighter first run checks for migration clings. (Bug 12626290)
2014-01-23 12:26:16 -08:00
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
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
f05ea4e361
am 747ef2ba: (-s ours) am c2abb6b4: (-s ours) Import translations. DO NOT MERGE
...
* commit '747ef2baf04854f0320055b69ce18ee9a40d8e3e':
Import translations. DO NOT MERGE
2014-01-23 10:45:01 -08:00
b6004885fb
am 4635a405: (-s ours) Import translations. DO NOT MERGE
...
* commit '4635a40596067650e618423637a88accc7ddad8a':
Import translations. DO NOT MERGE
2014-01-23 10:41:55 -08:00
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
4635a40596
Import translations. DO NOT MERGE
...
Change-Id: I2e2a6f98fd63d04c55e08e0c11d256105701457a
Auto-generated-cl: translation import
2014-01-23 10:28:57 -08:00
c2abb6b443
Import translations. DO NOT MERGE
...
Change-Id: I9a8480fdd1e29c679711c256f4e2a0d2d0687c36
Auto-generated-cl: translation import
2014-01-23 10:26:35 -08:00
b1f50d70e9
Catch exceptions if Exif is malformed
...
Bug: 11650650
Change-Id: Iee8f1675850c692fe54dc619f3e969ba180e4206
2014-01-23 15:26:50 +01:00
7e88748b28
am 391f1a80: Merge "Disable Set Wallpaper button while loading image" into ub-now-lunchbox
...
* commit '391f1a8062a17ec0865128a910e6d90049c352d5':
Disable Set Wallpaper button while loading image
2014-01-23 05:24:49 -08:00
391f1a8062
Merge "Disable Set Wallpaper button while loading image" into ub-now-lunchbox
2014-01-23 13:22:29 +00:00
8f3321bdab
am 4195da42: am 94449158: Avoid NPE from delayed Runnable
...
* commit '4195da42b77e1f0bf69f2d36583cdd176ecc5288':
Avoid NPE from delayed Runnable
2014-01-22 11:35:14 -08:00
4195da42b7
am 94449158: Avoid NPE from delayed Runnable
...
* commit '944491587e8a8f77233a1916cc16cd07edd97f2e':
Avoid NPE from delayed Runnable
2014-01-22 11:32:47 -08:00
0b560dda27
Adding tighter first run checks for migration clings. (Bug 12626290)
...
Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
2014-01-21 13:00:26 -08:00
2b4717447e
Defend against missing DB during migration.
...
Bug: 12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
2014-01-21 14:14:41 -05:00
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
e434aff32d
am f488644c: am a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit
...
* commit 'f488644c2cbfa831aab1077e59458879cb7511a2':
Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
2014-01-17 16:24:42 -08:00
608401ac43
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
at a4db090b13
2014-01-17 17:24:31 -07:00
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
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
930514df05
Fix overlapping pages (issue 12551580)
...
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
(cherry picked from commit efb31e399d
2014-01-18 00:01:10 +00:00
3abfd16e5d
Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
...
Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
2014-01-17 14:43:02 -08:00
5489f34dd6
am 0d5de134: am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
...
* commit '0d5de134258f71269a2d3b846521544bbad2a2eb':
Fix overlapping pages (issue 12551580)
2014-01-17 14:36:44 -08:00
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
5ac62d6914
Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
2014-01-17 22:32:22 +00:00
cecb23d30a
am c0734796: am e6e0af03: Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit
...
* commit 'c07347961e9c924aa042b9e1d3526e9b5e1c95ca':
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 13:30:53 -08:00
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
b608ae672d
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
at e6e0af03ee
2014-01-17 13:58:40 -07:00
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
e029874bcf
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 12:03:00 -08:00
849aff7553
Disable Set Wallpaper button while loading image
...
Bug: 12472111
Change-Id: I2a0cba47f31af2416b0dd062929f277fcbf80481
2014-01-17 13:30:11 +01:00
8ffe7b76ac
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
Conflicts:
src/com/android/launcher3/LauncherClings.java
Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9
2014-01-17 12:17:52 +00:00
025a5eec5a
am f3a8e8c0: Disabled the wallpaper when completely in -1 Now space.
...
* commit 'f3a8e8c0bd8b0dbe3991e5ad9d315e6e253e92eb':
Disabled the wallpaper when completely in -1 Now space.
2014-01-16 16:19:16 -08:00
efb31e399d
Fix overlapping pages (issue 12551580)
...
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
2014-01-16 16:09:05 -08:00
f3a8e8c0bd
Disabled the wallpaper when completely in -1 Now space.
...
Bug: 11186234
Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
2014-01-16 23:57:27 +00:00
6b14dd5e8e
am cdd82ef1: am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
...
* commit 'cdd82ef1bbe32ba3d83810e5d2e95ed4e9002204':
Updating Tablet clings. (Bug 11973614)
2014-01-16 15:13:14 -08:00
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
80cc87ca63
am ce46ad2a: am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit
...
* commit 'ce46ad2add6a3bbcacc27b5ff0ccc4589d848e64':
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
2014-01-16 15:09:59 -08:00
fb86919503
am 5a02d4c3: am 08101b1f: Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
...
* commit '5a02d4c325e51617cab319d3e104f6e1c24b8f36':
Lazy load the widget preview loader class
2014-01-16 15:09:59 -08:00
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
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
f858404271
Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
2014-01-16 23:07:02 +00:00
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
08101b1f52
Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
2014-01-16 23:05:00 +00:00
795ada2fb3
am 88eefe43: am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit
...
* commit '88eefe43bfbce822372ac430dcd119b9c0c7518c':
Updating screen background assets. (Bug 12136457)
2014-01-16 14:51:47 -08:00
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
e1b0682af0
Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit
2014-01-16 22:48:33 +00:00
6d110117be
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
...
Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
2014-01-16 14:47:53 -08:00
Michael Jurka
Huy Nguyen
Winson Chung
Baligh Uddin
Ian Parkinson
Dan Sandler
Adam Cohen
Jim Guggemos
Mark Ashdown
Selim Cinek