0fd2877e2f
am dc1f5c4d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
...
* commit 'dc1f5c4dcb39146320a692606a7371d130afbfe7':
Import translations. DO NOT MERGE
2014-04-02 21:16:40 +00:00
dc1f5c4dcb
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-04-02 21:11:28 +00:00
66cba496ef
am 1ca63ead: (-s ours) am cc95d18d: (-s ours) Import translations. DO NOT MERGE
...
* commit '1ca63ead10a25dca9889529f44fc4fb0139bb410':
Import translations. DO NOT MERGE
2014-04-02 20:16:07 +00:00
1ca63ead10
am cc95d18d: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc95d18d6ddeaf247b1f43659153edb1b3f315d7':
Import translations. DO NOT MERGE
2014-04-02 20:12:21 +00:00
cda6fc3430
Import translations. DO NOT MERGE
...
Change-Id: I3c16fbad924bbc62bcb4ff0b419e7409c1d796b4
Auto-generated-cl: translation import
2014-04-02 12:34:59 -07:00
cc95d18d6d
Import translations. DO NOT MERGE
...
Change-Id: If301cb07c8b50249a8e657c2ebe6d0f86f613b26
Auto-generated-cl: translation import
2014-04-02 12:34:32 -07:00
d40d1322d4
Import translations. DO NOT MERGE
...
Change-Id: I86d2cd7fcf495f5810cfac5c2f6b4037a49b2ebf
Auto-generated-cl: translation import
2014-04-02 12:33:56 -07:00
1d11a8f393
am 2204dc6b: am 7f83b228: Merge "update strings for welcome back" into ub-now-mister-ugly
...
* commit '2204dc6b63b9e0c681c7280364263dfcbcb3a7bf':
update strings for welcome back
2014-04-02 02:35:33 +00:00
2204dc6b63
am 7f83b228: Merge "update strings for welcome back" into ub-now-mister-ugly
...
* commit '7f83b228353ff2af5ef8d48ad48fdd4082f67aa3':
update strings for welcome back
2014-04-02 02:32:50 +00:00
7f83b22835
Merge "update strings for welcome back" into ub-now-mister-ugly
2014-04-02 02:28:11 +00:00
1c7d12a9d0
am 7727179c: am dcb173d0: Make sure the workspace screens don\'t get updated while workspace is loading
...
* commit '7727179cd92caa992def57947c5772447a060e36':
Make sure the workspace screens don't get updated while workspace is loading
2014-04-01 21:56:39 +00:00
7727179cd9
am dcb173d0: Make sure the workspace screens don\'t get updated while workspace is loading
...
* commit 'dcb173d0e348c23d967bb0939e63b6ce4e1bd503':
Make sure the workspace screens don't get updated while workspace is loading
2014-04-01 21:51:00 +00:00
dcb173d0e3
Make sure the workspace screens don't get updated while workspace is loading
...
-> Found another path that could lead to the same issue
[add shortcut with config activity to an existing folder,
when config activity launches, kill launcher, configure
shortcut. observe crash and data loss].
-> Plugged up above, and a couple other potential holes
-> Initial fix probably took care of the main issue
Issue 12523285
Change-Id: I29db9da4af4a8bf22047eb46bd49354447d04b8d
2014-04-01 14:31:51 -07:00
c6e7d9e917
update strings for welcome back
...
Bug: 13531041
Change-Id: Iabcb40df50850bd91b9ec972b407e4267960e4b9
2014-04-01 16:14:00 -04:00
f15d843207
am 804bcbf3: am 8440e7ce: Merge "Increase delay before dismissing intro screen (issue 13691305)" into ub-now-mister-ugly
...
* commit '804bcbf34295090b28c5a6a374ab464ea2726349':
Increase delay before dismissing intro screen (issue 13691305)
2014-03-31 15:16:50 +00:00
804bcbf342
am 8440e7ce: Merge "Increase delay before dismissing intro screen (issue 13691305)" into ub-now-mister-ugly
...
* commit '8440e7ce17a3d54254217c69982c2ec2937ba4ba':
Increase delay before dismissing intro screen (issue 13691305)
2014-03-31 15:14:10 +00:00
8440e7ce17
Merge "Increase delay before dismissing intro screen (issue 13691305)" into ub-now-mister-ugly
2014-03-31 15:10:34 +00:00
cdc5bda4bf
am dc493591: am 4a9423d6: Add method to determine if first run activity has been shown (issue 13680732)
...
* commit 'dc493591f8917822f8f991e849e8e9eba5e65356':
Add method to determine if first run activity has been shown (issue 13680732)
2014-03-28 23:08:18 +00:00
dc493591f8
am 4a9423d6: Add method to determine if first run activity has been shown (issue 13680732)
...
* commit '4a9423d6ddda9009f9489d5546a822f9222e78c4':
Add method to determine if first run activity has been shown (issue 13680732)
2014-03-28 23:04:26 +00:00
2252adea26
Increase delay before dismissing intro screen (issue 13691305)
...
Change-Id: I0b81d61b922278e0e72c3055086010612687c7d9
2014-03-28 15:29:07 -07:00
4a9423d6dd
Add method to determine if first run activity has been shown (issue 13680732)
...
Change-Id: Ia0da4148fd0365c6ae9c3a5a4cff7118959f6382
2014-03-28 14:51:17 -07:00
1b8833b154
am 08d79b78: am 31442560: Fixed crash when setting wallpaper with built in rotation
...
* commit '08d79b786476146e7dc3fbabea696d7609b94e37':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 20:07:32 +00:00
08d79b7864
am 31442560: Fixed crash when setting wallpaper with built in rotation
...
* commit '314425602a7ccd9cc2bdef1a11f5e51211201b6f':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 20:03:42 +00:00
314425602a
Fixed crash when setting wallpaper with built in rotation
...
If an image had a built-in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees.
Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug: 13507421
2014-03-27 20:35:19 +01:00
1f4d0b9d37
am 68f8cf93: am 7c989e90: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '68f8cf930a49cdf8db71c612f5bc5a64ff91902b':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-24 16:50:53 +00:00
68f8cf930a
am 7c989e90: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '7c989e90e84b29f4762abaf2c80ecafc1a9e99d4':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-24 16:46:47 +00:00
7c989e90e8
Fixed wallpaper bug where wrong size was taken when cropping
...
When cropping, the selected area of the image was incorrectly
cropped to the size of the view instead of the size of the image
Bug: 13617446
Change-Id: I0b40711c04f3d3b5929e7bb037d6cf21d4bb5bcb
2014-03-24 14:13:20 +01:00
620e1d07de
am 8db5a859: am 4dfbe829: Merge "Fix missing stack trace on checkItemInfoLocked call" into ub-now-mister-ugly
...
* commit '8db5a8596f48db54eb16f523024e4ddefbc65304':
Fix missing stack trace on checkItemInfoLocked call
2014-03-21 20:20:09 +00:00
8db5a8596f
am 4dfbe829: Merge "Fix missing stack trace on checkItemInfoLocked call" into ub-now-mister-ugly
...
* commit '4dfbe82910151b3b19c756404d49e0c16d62532c':
Fix missing stack trace on checkItemInfoLocked call
2014-03-21 20:14:28 +00:00
4dfbe82910
Merge "Fix missing stack trace on checkItemInfoLocked call" into ub-now-mister-ugly
2014-03-21 20:09:54 +00:00
0bfccebc9b
Allow the old launcher content URI to be overrided
...
Move the URI used to import favorites from launcher2 to be loaded
from a string resource. This allows it to be overridden.
This will enable permissions fix for GoogleSearch.
Bug: 12058200
Change-Id: I31243fe89f545c9771d5cceffe1c9e7668a42bc5
2014-03-21 15:42:06 -04:00
0a6317e75a
am cd4af2b5: am 36a62885: Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-ugly
...
* commit 'cd4af2b5a6024258cc47bcea29adf7e1502097bf':
Adding in-activity intro screen (issue 12905636)
2014-03-20 22:39:56 +00:00
cd4af2b5a6
am 36a62885: Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-ugly
...
* commit '36a6288545060415189803f24bb6252b98e071e3':
Adding in-activity intro screen (issue 12905636)
2014-03-20 22:37:38 +00:00
36a6288545
Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-ugly
2014-03-20 22:34:11 +00:00
8e19cf22a4
Fix missing stack trace on checkItemInfoLocked call
...
Just put this change into Launcher2, now adding to Launcher3
The call to checkItemInfoLocked from addItemToDatabase was missing a stack
trace so that if the check failed, the stack trace did not contain what
triggered the add.
Change-Id: Ia2e2aae20b16d4adadfe1da53b49e93073fab55c
2014-03-20 15:06:57 -04:00
106b6f0a2a
am bba150b6: (-s ours) am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit 'bba150b6fc733847a04014abb22624c2c9456025':
Import translations. DO NOT MERGE
2014-03-20 18:53:27 +00:00
bba150b6fc
am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit 'febf1b9c39c109c23297787dfc5fc0476e184c41':
Import translations. DO NOT MERGE
2014-03-20 18:50:37 +00:00
2f3c23858f
am a321f527: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
...
* commit 'a321f5274b2fbb45932908690a84342ce63de453':
Import translations. DO NOT MERGE
2014-03-20 18:49:05 +00:00
432609a246
Adding in-activity intro screen (issue 12905636)
...
Change-Id: Ifb016ca6e5052fd91535b98a39f78569200955a8
2014-03-20 11:48:22 -07:00
99dddecdbd
Merge "Import translations. DO NOT MERGE" into ub-now-master
2014-03-20 18:44:55 +00:00
febf1b9c39
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
2014-03-20 18:44:53 +00:00
a321f5274b
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-03-20 18:44:51 +00:00
3a9f3a7806
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658
...
* commit 'ddaac40dc8f034c6d1f44fb95f3d710c44a97b39':
2014-03-20 16:37:41 +00:00
efaf2c857a
am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'e35f8e2cacdb44284014b8c7bc688fac9859f632':
Don't lose icons when migrating from different-sized hotseats.
2014-03-20 16:37:40 +00:00
16880deb08
am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '32e4344a20c4f9c9323061aaef96678c098d6200':
Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"
2014-03-20 16:37:40 +00:00
9e5d50c6de
am 49635c71: (-s ours) am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '49635c7147d1e71d052b80d89c69785baaee99b3':
Disabling cling when the user moves the folder before launching it. (Bug 12963868)
2014-03-20 16:37:39 +00:00
6cea674843
am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit 'a4d0ef3c84cb5a9951d7d967c2c99d54d573f927':
Fix issue of extra blank screen after uninstall (issue 12372657)
Fix build
Changed behaviour of the wallpaper picker.
Guard against null default wallpaper
Avoid stripping empty screens if the workspace is still loading (issue 12523285)
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
skip backup if launcher is in a bad state
Revert "Disabled the wallpaper when completely in -1 Now space."
Updating Read/Write settings permission protectionLevels. (Bug 11372484)
Fixed visibility issue of save button in case the url loading failed
Import translations. DO NOT MERGE
2014-03-20 16:31:56 +00:00
d6518c4b95
am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '48e725bdf4c92d3faf82c1788b56aa0491b566be':
Fix issue where clings didn't appear after set up wizard (issue 13077829)
Import translations. DO NOT MERGE
use restored icon for restored app shortcuts
Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.
2014-03-20 16:31:55 +00:00
58dcef7b28
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '9ee142497e1272697393867be0bccddd758aef35':
Implement spring-loading of folders when dragging over.
Do updateWorkspaceScreenOrder inside a single transaction.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2014-03-20 15:55:06 +00:00
cd76f89f12
am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
...
* commit '6508fe1b07ec888012255e3a2438382b45a9707f':
Fix NPE in when dropping from all apps (issue 12917451)
update placeholder on package install or restore
2014-03-20 15:55:05 +00:00
Baligh Uddin
Chris Wren
Adam Cohen
Selim Cinek
Jason Monk
Huy Nguyen
Mark Ashdown
Mathew Inwood
Juan Silveira
Anton Hansson