Baligh Uddin
d25f91b036
am f47cc890: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f47cc890e9475b31acd1416de57d32062d395e9e':
Import translations. DO NOT MERGE
2014-01-31 16:25:44 -08:00
Baligh Uddin
f47cc890e9
Import translations. DO NOT MERGE
...
Change-Id: I630533bcc5d004fc677f54233f8d0578e119ab4e
Auto-generated-cl: translation import
2014-01-31 15:57:58 -08:00
Derek Prothro
ae7999c878
am 93b92d08: Merge "Fix black flash during rotation of -1 screen with GEL." into ub-now-lunchbox
...
* commit '93b92d0895f86fddf270b4861282b75c8e455ce3':
Fix black flash during rotation of -1 screen with GEL.
2014-01-30 14:10:45 -08:00
Derek Prothro
93b92d0895
Merge "Fix black flash during rotation of -1 screen with GEL." into ub-now-lunchbox
2014-01-30 22:03:55 +00:00
Derek Prothro
dadd984a89
Fix black flash during rotation of -1 screen with GEL.
...
We need to make sure the custom content is adding synchronously
while the rest of the workspace is being created. If we wait
for it to be added in a separate run task, we see a black
flash during rotation.
Also rename a few methods and remove obsolete methods.
Bug: 11802691
Change-Id: I3f6500aa1fabe68cef59ad8c764877f954986a99
2014-01-30 15:55:48 -05:00
Baligh Uddin
abecfe309e
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
2014-01-30 16:52:40 +00:00
Michael Jurka
1a088d64ec
am 2a4f4928: Fix bug: Scroll position reported incorrectly to live wallpapers
...
* commit '2a4f4928a964fa8eef9ea6542f835ad4a79b9bd5':
Fix bug: Scroll position reported incorrectly to live wallpapers
2014-01-30 05:29:03 -08:00
Michael Jurka
2a4f4928a9
Fix bug: Scroll position reported incorrectly to live wallpapers
...
Bug: 11189265
Change-Id: I410f318df4e43ed13d33889a8158a03438a6174f
2014-01-30 14:21:09 +01:00
Baligh Uddin
ecbfb7dd40
Import translations. DO NOT MERGE
...
Change-Id: Ia3907e8f94ebaa314fa075cabb54b21b1f59dca9
Auto-generated-cl: translation import
2014-01-29 13:23:03 -08:00
Sandeep Siddhartha
ef154fac24
am d805837a: Add callback for "Widgets" button click in launcher
...
* commit 'd805837a877bb503d7890c4f92cfd183dec8c5ee':
Add callback for "Widgets" button click in launcher
2014-01-28 11:34:30 -08:00
Sandeep Siddhartha
d805837a87
Add callback for "Widgets" button click in launcher
...
Bug: 12553852
Change-Id: I8befd046242b32e86dbc6c98e6d97f0307380dd0
2014-01-28 10:41:15 -08:00
Chris Wren
9c09d8e7d0
am f4d08110: handle shortcut restore for missing packages
...
* commit 'f4d081107f5984bfb92cb1a627667fea5bf1498c':
handle shortcut restore for missing packages
2014-01-28 07:45:09 -08:00
Chris Wren
f4d081107f
handle shortcut restore for missing packages
...
Bug: 10778992
Change-Id: I8766b8d4dd9c0269d52a7ec3da58dd408bc5f09f
2014-01-27 17:30:48 -05:00
Ian Parkinson
8944f244d5
Merge Launcher3 jb-ub-now-kermit to kermit-release
2014-01-27 17:38:11 +00:00
Dan Sandler
7051fe9021
am 947ef4e7: am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit
...
* commit '947ef4e7ab4cc303fc708ee45a241969ca7ebbdc':
Defend against missing DB during migration.
2014-01-24 21:03:27 -08:00
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
ec8d92a5a3
am 523e762a: Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox
...
* commit '523e762ad43aaacbf494d207b9556d4f827d26c2':
Catch exceptions if Exif is malformed
2014-01-24 04:06:38 -08:00
Michael Jurka
523e762ad4
Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox
2014-01-24 12:04:45 +00:00
Huy Nguyen
6a996e7d34
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
2014-01-23 14:36:56 -08:00
Winson Chung
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
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
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
Baligh Uddin
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
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
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
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
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
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
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
Jim Guggemos
608401ac43
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
at a4db090b13
2014-01-17 17:24:31 -07: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
Adam Cohen
930514df05
Fix overlapping pages (issue 12551580)
...
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
(cherry picked from commit efb31e399d )
2014-01-18 00:01:10 +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
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
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
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
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
Jim Guggemos
b608ae672d
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
at e6e0af03ee
2014-01-17 13:58:40 -07: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