Merge lp:~tomdroid-dev/tomdroid/shortcuts into lp:~tomdroid-maintainers/tomdroid/main

[Piotr Adamski]

[Stefan Hammer (j-4-deactivatedaccount)]

Hi!

I already did a tomdroid icon therefore in all resolutions with an svg.
Maybe you can move the branch to tomdroid-dev, so that i can participate?

I just tried it - looks just great!

[lp:~tomdroid-dev/tomdroid/shortcuts]

261. By Piotr Adamski on 2011-10-27

turned off logging

[Piotr Adamski (mcveat)]

On Thu, Oct 27, 2011 at 8:05 PM, Stefan Hammer <email address hidden> wrote:
> I already did a tomdroid icon therefore in all resolutions with an svg.
> Maybe you can move the branch to tomdroid-dev, so that i can participate?

Done.

> I just tried it - looks just great!

I'm glad you liked it :)

Regards
Piotr

[lp:~tomdroid-dev/tomdroid/shortcuts]

262. By Stefan Hammer on 2011-10-27

Added new shortcut icon for all required screen resolutions. Also added new folder and icons for xhdpi, used in android 4.0

[Stefan Hammer (j-4-deactivatedaccount)]

I realized, there is still one issue. We don't have any design for the case, the note is deleted/not present any more.
At the moment a error message shows up, telling the user to file a bug if he can replicate this.

Is there a simple way to delete shortcuts when the note is not present any more? We could also delete the shortcut, when a removed note is called with it the first time. This is probably easier.

[Piotr Adamski (mcveat)]

On Thu, Oct 27, 2011 at 11:13 PM, Stefan Hammer <email address hidden> wrote:
> Is there a simple way to delete shortcuts when the note is not present any more? We could also delete the shortcut, when a removed note is called with it the first time. This is probably easier.

Those two shows that it is possible:
http://stackoverflow.com/questions/3480287/trying-to-uninstall-shortcut-but-shortcut-wont-go-away
http://chdorner.com/2011/01/31/android-home-screen-shortcuts-part-iii-remove-shortcuts/#respond

Though, I won't be able to check it before next week.

--
Pozdrawiam
Piotr Adamski
skype: piotr.adamski.

[Stefan Hammer (j-4-deactivatedaccount)]

I was looking, how other Android application are facing this problem:

The contact app just tells you in a toast message, that the contact could not be found any more.
The Bookmarks shortcut opens the browser and does not load a webpage.
Also the music app just tells you that the selected playlist is empty.

Therefore it is probably not necessary to delete the shortcut. If the note was actively deleted, then the user will know it and will also remove the shortcut by himself (at least after he is reminded by the error message.)

I will just change the error message, telling that the note was removed, but without the "bug report" part.

[lp:~tomdroid-dev/tomdroid/shortcuts]

263. By Stefan Hammer on 2011-10-28

Changed the error message, and made strings translateable.

[Piotr Adamski (mcveat)]

On Fri, Oct 28, 2011 at 12:30 PM, Stefan Hammer <email address hidden> wrote:
> I was looking, how other Android application are facing this problem:
>
> The contact app just tells you in a toast message, that the contact could not be found any more.
> The Bookmarks shortcut opens the browser and does not load a webpage.
> Also the music app just tells you that the selected playlist is empty.
>
> Therefore it is probably not necessary to delete the shortcut. If the note was actively deleted, then the user will know it and will also remove the shortcut by himself (at least after he is reminded by the error message.)
>
> I will just change the error message, telling that the note was removed, but without the "bug report" part.

I was thinking about something like activity that intercepts intents
from shortcuts and forwarding them to NoteView if note exists.
Otherwise it shows view/dialog saying something like "We couldn't find
that note, probably you removed it. If you want to remove the shortcut
press 'Remove'. If you believe that note should be here, please fill
bug report by clicking 'Report bug'".

What do you think?

--
Pozdrawiam
Piotr Adamski
skype: piotr.adamski.

[Stefan Hammer (j-4-deactivatedaccount)]

Sounds good to me.
If it is not too much work, you are welcomed to implement it.

I also saw a longpress menu entry "Add shortcut to Home" in the browser
bookmarks. Do you think, you can also do this for the longpress menu in
ListView? This way, the feature would be easier to find...

On 28/10/11 12:44, Piotr Adamski wrote:
> On Fri, Oct 28, 2011 at 12:30 PM, Stefan Hammer <email address hidden> wrote:
>> I was looking, how other Android application are facing this problem:
>>
>> The contact app just tells you in a toast message, that the contact could not be found any more.
>> The Bookmarks shortcut opens the browser and does not load a webpage.
>> Also the music app just tells you that the selected playlist is empty.
>>
>> Therefore it is probably not necessary to delete the shortcut. If the note was actively deleted, then the user will know it and will also remove the shortcut by himself (at least after he is reminded by the error message.)
>>
>> I will just change the error message, telling that the note was removed, but without the "bug report" part.
> I was thinking about something like activity that intercepts intents
> from shortcuts and forwarding them to NoteView if note exists.
> Otherwise it shows view/dialog saying something like "We couldn't find
> that note, probably you removed it. If you want to remove the shortcut
> press 'Remove'. If you believe that note should be here, please fill
> bug report by clicking 'Report bug'".
>
> What do you think?
>

[Piotr Adamski (mcveat)]

On Fri, Oct 28, 2011 at 12:55 PM, Stefan Hammer <email address hidden> wrote:
> Sounds good to me.
> If it is not too much work, you are welcomed to implement it.

> I also saw a longpress menu entry "Add shortcut to Home" in the browser
> bookmarks. Do you think, you can also do this for the longpress menu in
> ListView? This way, the feature would be easier to find...

I'll do both things on Tuesday.

Regards
Piotr

[lp:~tomdroid-dev/tomdroid/shortcuts]

264. By Piotr Adamski on 2011-11-03

shortcut removal logic

265. By Piotr Adamski on 2011-11-03

long click menu option to create a shortcut

[Piotr Adamski (mcveat)]

I've implemented both things (creating shortcut from context menu and removing it if it is not found) like agreed previously. Have a look.

[Olivier Bilodeau (plaxx)]

Please, in the future, don't change whitespace or re-organize imports. This is making patches, merging and searching history more complex for little value.

[lp:~tomdroid-dev/tomdroid/shortcuts]

266. By Olivier Bilodeau on 2012-03-31

merged lp:tomdroid

267. By Olivier Bilodeau on 2012-03-31

migrated logging to new TLog utility

268. By Olivier Bilodeau on 2012-03-31

NEWS entry for user-visible feature

[Olivier Bilodeau (plaxx)]

It's going in.

review: Approve

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2011-09-05 21:45:57 +0000
+++ AndroidManifest.xml	2012-03-31 19:28:19 +0000
@@ -63,11 +63,20 @@
 
     	</activity>
 
+        <activity android:name=".ui.ShortcutActivity" android:label="@string/shortcut_menu_item_caption">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
       <uses-library android:name="android.test.runner" />
     </application>
     
-	 <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />    
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
 
 <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.tomdroid"></instrumentation>
 

=== modified file 'NEWS'
--- NEWS	2012-03-05 12:44:17 +0000
+++ NEWS	2012-03-31 19:28:19 +0000
@@ -13,6 +13,8 @@
 
 -------------------------------------------------------------------------------
 Versoin 0.?? released on ??
+* Creating home-screen shortcuts to notes is now possible (Piotr Adamski, 
+  lp:882703)
 * Tons of new translations by the awesome Translators on Launchpad
 * Switched to the Launchpad Translation Platform (Stefan Hammer)
 * New Japanese translation (Koichi Akabe)

=== removed file 'data/icon-14.png'
Binary files data/icon-14.png	2010-12-12 23:05:20 +0000 and data/icon-14.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icon-192.png'
Binary files data/icon-192.png	2011-06-18 15:32:28 +0000 and data/icon-192.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icon-36.png'
Binary files data/icon-36.png	2011-06-19 02:51:26 +0000 and data/icon-36.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icon-48.png'
Binary files data/icon-48.png	2011-06-19 02:51:26 +0000 and data/icon-48.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icon-512.png'
Binary files data/icon-512.png	2011-06-18 15:32:28 +0000 and data/icon-512.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icon-64.png'
Binary files data/icon-64.png	2011-06-18 12:59:36 +0000 and data/icon-64.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icon-72.png'
Binary files data/icon-72.png	2011-06-19 02:51:26 +0000 and data/icon-72.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'data/icon-launcher'
=== added file 'data/icon-launcher/icon-14.png'
Binary files data/icon-launcher/icon-14.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-14.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-192.png'
Binary files data/icon-launcher/icon-192.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-192.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-36.png'
Binary files data/icon-launcher/icon-36.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-36.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-48.png'
Binary files data/icon-launcher/icon-48.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-48.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-512.png'
Binary files data/icon-launcher/icon-512.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-512.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-64.png'
Binary files data/icon-launcher/icon-64.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-64.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-72.png'
Binary files data/icon-launcher/icon-72.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-72.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-launcher/icon-96.png'
Binary files data/icon-launcher/icon-96.png	1970-01-01 00:00:00 +0000 and data/icon-launcher/icon-96.png	2012-03-31 19:28:19 +0000 differ
=== added directory 'data/icon-shortcut'
=== added file 'data/icon-shortcut/tomdroid-singlenote-36.png'
Binary files data/icon-shortcut/tomdroid-singlenote-36.png	1970-01-01 00:00:00 +0000 and data/icon-shortcut/tomdroid-singlenote-36.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-shortcut/tomdroid-singlenote-48.png'
Binary files data/icon-shortcut/tomdroid-singlenote-48.png	1970-01-01 00:00:00 +0000 and data/icon-shortcut/tomdroid-singlenote-48.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-shortcut/tomdroid-singlenote-72.png'
Binary files data/icon-shortcut/tomdroid-singlenote-72.png	1970-01-01 00:00:00 +0000 and data/icon-shortcut/tomdroid-singlenote-72.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/icon-shortcut/tomdroid-singlenote-96.png'
Binary files data/icon-shortcut/tomdroid-singlenote-96.png	1970-01-01 00:00:00 +0000 and data/icon-shortcut/tomdroid-singlenote-96.png	2012-03-31 19:28:19 +0000 differ
=== added file 'data/tomdroid-singlenote.svg'
--- data/tomdroid-singlenote.svg	1970-01-01 00:00:00 +0000
+++ data/tomdroid-singlenote.svg	2012-03-31 19:28:19 +0000
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   width="48px"
+   height="48px"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="tomdroid-singlenote.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true"
+   version="1.1">
+  <defs
+     id="defs3">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4244"
+       is_visible="true" />
+    <linearGradient
+       id="linearGradient2994">
+      <stop
+         id="stop2996"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop2998"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2974">
+      <stop
+         id="stop2976"
+         offset="0"
+         style="stop-color:#c1c1c1;stop-opacity:1;" />
+      <stop
+         id="stop2978"
+         offset="1"
+         style="stop-color:#acacac;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2966">
+      <stop
+         id="stop2968"
+         offset="0"
+         style="stop-color:#ffd1d1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff1d1d;stop-opacity:1;"
+         offset="0.5"
+         id="stop3006" />
+      <stop
+         id="stop2970"
+         offset="1"
+         style="stop-color:#6f0000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6417">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop6419" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop6421" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6407">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop6409" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop6411" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6377">
+      <stop
+         style="stop-color:#fff27e;stop-opacity:1;"
+         offset="0"
+         id="stop6379" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1;"
+         offset="1"
+         id="stop6381" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6417"
+       id="radialGradient3232"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3194495,-0.00765637,0.00384809,0.6631555,-18.199333,18.582531)"
+       cx="42.141071"
+       cy="26.217604"
+       fx="42.141071"
+       fy="26.217604"
+       r="5.2591065" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6407"
+       id="radialGradient3916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.7241373,-1.0744104e-7,0,18.970946,-385.27052,-653.71305)"
+       cx="43.875"
+       cy="35.90107"
+       fx="43.875"
+       fy="35.90107"
+       r="20.21875" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6377"
+       id="radialGradient3919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5050109,0,1.5345205e-8,1.9614971,-25.133441,-36.408804)"
+       cx="48.507545"
+       cy="35.338047"
+       fx="48.507545"
+       fy="35.338047"
+       r="21.626934" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6407"
+       id="radialGradient3947"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.7241373,-1.0744104e-7,0,18.970946,-385.27052,-653.42826)"
+       cx="43.875"
+       cy="35.90107"
+       fx="43.875"
+       fy="35.90107"
+       r="20.21875" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#c4a000"
+     fill="#edd400"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.7395605"
+     inkscape:cx="33.751231"
+     inkscape:cy="35.023961"
+     inkscape:current-layer="g3192"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="848"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:title />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3192"
+       transform="translate(0,3.2818261)">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path6415"
+         d="m 43.358146,37.10667 c -1.955027,-2.577031 -2.363101,-4.996371 -2.363101,-4.996371 0,0 -3.427308,1.967628 -6.704804,5.873144 4.10326,-0.07874 7.073315,-0.539629 9.067905,-0.876773 z"
+         style="opacity:0.46629214;color:#000000;fill:url(#radialGradient3232);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="fill:url(#radialGradient3919);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.20358479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 7.0748073,3.4640545 7.09375,37.972293 c 0,0 23.569096,-0.379906 24.417702,-0.409994 7.508882,-0.266237 10.541631,-2.429155 10.541631,-2.429155 0,0 -1.727734,-2.941123 -1.924805,-7.518229 0.09304,-4.854243 -0.19845,-24.1317182 -0.225696,-24.1324758 z"
+         id="path2524"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccscccc" />
+      <path
+         sodipodi:nodetypes="csccsccscccccscccssccccsccccccccccsscccs"
+         inkscape:connector-curvature="0"
+         id="rect5365-8"
+         d="m 26.40625,18.066043 c -0.0699,-0.0027 -0.125999,0.03637 -0.1875,0.0625 -0.184503,0.07839 -0.303633,0.266016 -0.3125,0.5 l -0.125,2.96875 c -1.124246,0.118287 -2.259295,0.448489 -3.375,0.96875 -1.238378,0.577466 -2.294058,1.353548 -3.15625,2.25 l -2.4375,-1.90625 c -0.246589,-0.19148 -0.578386,-0.158503 -0.75,0.0625 -0.171613,0.221006 -0.121589,0.558521 0.125,0.75 l 2.40625,1.84375 c -1.77245,2.265013 -2.346012,5.113828 -1.21875,7.53125 0.09478,0.203263 0.229692,0.373814 0.34375,0.5625 l 16.1875,-7.5625 c -0.07123,-0.208658 -0.123967,-0.421737 -0.21875,-0.625 -1.172353,-2.514119 -3.89038,-3.912332 -6.90625,-3.90625 l 0.125,-2.875 c 0.01182,-0.311979 -0.220385,-0.614405 -0.5,-0.625 z m 10.6875,7.1875 c -0.258365,0.0118 -0.500367,0.07109 -0.75,0.1875 -0.998535,0.465624 -1.465624,1.626465 -1,2.625 1.700417,3.663271 1.988865,7.756578 4.836635,6.409375 -0.392039,-0.795254 -1.476419,-3.812698 -1.466943,-6.636774 l -0.04522,-1.629953 C 38.257409,25.582989 37.868845,25.218143 37.09375,25.253543 z m -3.09375,1.5 -15.90625,7.40625 0.5,1.0625 0.125,0.3125 0.685699,0.761139 c 5.406993,0.0226 6.857349,-0.132806 9.585293,-0.114762 2.997479,0.03137 7.93409,-0.393167 9.971171,-1.245799 L 35.25,29.409793 l -0.75,-1.625 z m -17.75,8.0625 c -0.256948,0.0079 -0.531616,0.07109 -0.78125,0.1875 -0.644887,0.300715 -0.73318,0.749126 -0.817004,1.408501 0.262591,-0.01956 2.545204,-0.0582 3.772997,-0.07301 L 18.063401,35.695096 C 17.621784,35.192592 17.020844,34.792323 16.25,34.816043 z"
+         style="fill:#d40000;fill-opacity:1;stroke:#ffffff;stroke-width:1.70000005;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccssccccc"
+         inkscape:connector-curvature="0"
+         id="path6403"
+         d="M 8.2909654,4.6548527 8.276419,36.767213 c 1.5140685,0.01637 13.549334,-0.276225 17.936687,-0.292207 6.657813,-0.02425 7.880729,-0.187611 10.265264,-0.749691 0.991388,-0.233689 3.406853,-0.980695 4.004516,-1.18784 -0.6232,-1.468795 -1.102231,-2.956253 -1.490862,-5.269428 -0.203285,-1.425146 -0.07204,-3.09413 -0.0647,-5.333435 0.0921,-2.139589 -0.186589,-19.2342051 -0.186589,-19.2342051 z"
+         style="opacity:0.46600001;fill:none;stroke:url(#radialGradient3947);stroke-width:1.2195574px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <g
+         id="g4229"
+         transform="translate(0,0.2847933)">
+        <path
+           sodipodi:nodetypes="cccccscccc"
+           style="fill:#97c024;fill-opacity:1;stroke:none"
+           d="M 34.154899,26.376351 18.125,33.90625 l 0.5,1.03125 0.15625,0.3125 0.438851,1.053282 c 4.9051,-0.07007 9.545242,-0.07098 12.602306,-0.171077 2.821883,-0.0924 3.992221,-0.35808 6.409554,-0.957402 l -0.869085,-1.304336 c -1.471749,-2.509796 -1.990441,-3.575564 -2.893225,-6.185219 z"
+           id="rect5365"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           style="fill:#97c024;fill-opacity:1;stroke:none"
+           d="m 16.31205,34.470101 c -0.2582,0.0097 -0.531616,0.07109 -0.78125,0.1875 -0.634414,0.295832 -0.892515,1.111882 -0.983761,1.754321 1.771234,-0.08119 1.977148,-0.04534 3.939753,-0.0911 L 18.18705,35.626319 c -0.349218,-0.748901 -1.1004,-1.185217 -1.875,-1.15625 z"
+           id="rect5394"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           style="fill:#97c024;fill-opacity:1;stroke:none"
+           d="m 37.125,25 c -0.2582,0.0097 -0.500366,0.07109 -0.75,0.1875 -0.998535,0.465624 -1.557573,1.256869 -1.245947,2.347803 0,0 0.710827,3.26144 3.790796,7.480998 0.526502,-0.152989 0.928663,-0.267618 1.699658,-0.677415 -1.116286,-2.362942 -1.655744,-5.229672 -1.646269,-7.992148 l -0.0476,-0.201056 C 38.605678,25.431317 37.8996,24.971033 37.125,25 z"
+           id="rect5394-2"
+           inkscape:connector-curvature="0" />
+        <g
+           style="stroke:none"
+           id="g5481"
+           transform="matrix(0.90630778,-0.42261826,0.42261826,0.90630778,-1.2035996,29.947087)">
+          <path
+             id="path5418"
+             d="m 24.65625,3.0625 c -4.968725,0 -9,3.3092317 -9,7.40625 0,0.224276 0.03887,0.43704 0.0625,0.65625 l 17.875,0 c 0.02363,-0.21921 0.0625,-0.431974 0.0625,-0.65625 0,-4.0970183 -4.031275,-7.40625 -9,-7.40625 z"
+             style="fill:#97c024;fill-opacity:1;stroke:none"
+             inkscape:connector-curvature="0" />
+          <path
+             transform="matrix(1.0212245,0,0,1.0212245,-1.4154165,-1.4231952)"
+             d="m 22.160222,8.3357286 c 0,0.427136 -0.353329,0.7733981 -0.789182,0.7733981 -0.435853,0 -0.789181,-0.3462621 -0.789181,-0.7733981 0,-0.4271359 0.353328,-0.773398 0.789181,-0.773398 0.435853,0 0.789182,0.3462621 0.789182,0.773398 z"
+             sodipodi:ry="0.77339804"
+             sodipodi:rx="0.78918165"
+             sodipodi:cy="8.3357286"
+             sodipodi:cx="21.37104"
+             id="path5449"
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(1.0212245,0,0,1.0212245,6.7121839,-1.4238284)"
+             d="m 22.160222,8.3357286 c 0,0.427136 -0.353329,0.7733981 -0.789182,0.7733981 -0.435853,0 -0.789181,-0.3462621 -0.789181,-0.7733981 0,-0.4271359 0.353328,-0.773398 0.789181,-0.773398 0.435853,0 0.789182,0.3462621 0.789182,0.773398 z"
+             sodipodi:ry="0.77339804"
+             sodipodi:rx="0.78918165"
+             sodipodi:cy="8.3357286"
+             sodipodi:cx="21.37104"
+             id="path5449-6"
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             sodipodi:type="arc" />
+          <rect
+             ry="0.56354231"
+             transform="matrix(0.88965349,-0.45663625,0.45663625,0.88965349,0,0)"
+             rx="0.50507671"
+             y="9.2116003"
+             x="15.824705"
+             height="5.0507627"
+             width="1.0101534"
+             id="rect5423"
+             style="fill:#97c024;fill-opacity:1;stroke:none" />
+          <rect
+             ry="0.56354231"
+             transform="matrix(-0.88965349,-0.45663625,-0.45663625,0.88965349,0,0)"
+             rx="0.50507671"
+             y="-13.159358"
+             x="-27.690969"
+             height="5.0507627"
+             width="1.0101534"
+             id="rect5423-6"
+             style="fill:#97c024;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'res/drawable-hdpi/ic_shortcut.png'
Binary files res/drawable-hdpi/ic_shortcut.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_shortcut.png	2012-03-31 19:28:19 +0000 differ
=== modified file 'res/drawable-ldpi/ic_launcher.png'
Binary files res/drawable-ldpi/ic_launcher.png	2011-06-19 02:51:26 +0000 and res/drawable-ldpi/ic_launcher.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/drawable-ldpi/ic_shortcut.png'
Binary files res/drawable-ldpi/ic_shortcut.png	1970-01-01 00:00:00 +0000 and res/drawable-ldpi/ic_shortcut.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/drawable-mdpi/ic_shortcut.png'
Binary files res/drawable-mdpi/ic_shortcut.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_shortcut.png	2012-03-31 19:28:19 +0000 differ
=== added directory 'res/drawable-xhdpi'
=== added file 'res/drawable-xhdpi/ic_launcher.png'
Binary files res/drawable-xhdpi/ic_launcher.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_launcher.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/drawable-xhdpi/ic_shortcut.png'
Binary files res/drawable-xhdpi/ic_shortcut.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_shortcut.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/drawable-xhdpi/icon_actionbar_dot.png'
Binary files res/drawable-xhdpi/icon_actionbar_dot.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/icon_actionbar_dot.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/drawable-xhdpi/icon_actionbar_sync.png'
Binary files res/drawable-xhdpi/icon_actionbar_sync.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/icon_actionbar_sync.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/drawable-xhdpi/icon_actionbar_sync_background.png'
Binary files res/drawable-xhdpi/icon_actionbar_sync_background.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/icon_actionbar_sync_background.png	2012-03-31 19:28:19 +0000 differ
=== added file 'res/layout/shortcuts_list.xml'
--- res/layout/shortcuts_list.xml	1970-01-01 00:00:00 +0000
+++ res/layout/shortcuts_list.xml	2012-03-31 19:28:19 +0000
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ Tomdroid
+ Tomboy on Android
+ http://www.launchpad.net/tomdroid
+
+ Copyright 2011 Piotr Adamski <[e-mail]>
+ 
+ This file is part of Tomdroid.
+ 
+ Tomdroid is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ Tomdroid is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+        >
+
+    <LinearLayout android:layout_width="fill_parent"
+                  android:orientation="horizontal"
+                  android:layout_height="40dip"
+                  android:background="@drawable/actionbar_background">
+        <ImageView
+                android:id="@+id/action_icon"
+                android:layout_width="40dip"
+                android:layout_height="fill_parent"
+                android:scaleType="fitStart"
+                android:padding="0dip"
+                android:src="@drawable/actionbar_icon"
+                android:clickable="true"
+                />
+        <TextView android:id="@+id/shortcuts_view_caption"
+                  android:text="@string/shortcuts_view_caption"
+                  android:layout_width="fill_parent"
+                  android:layout_height="fill_parent"
+                  android:gravity="center"
+                  android:orientation="horizontal"
+                  android:textSize="18dip"
+                  android:textStyle="bold"
+                  android:paddingRight="42dip"/>
+    </LinearLayout>
+
+
+    <ListView android:id="@android:id/android:list"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:divider="#FFCCCCCC"
+              android:dividerHeight="1px"
+            />
+
+    <TextView android:id="@+id/list_empty"
+              android:text="@string/strListEmptyNoNotes"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:singleLine="false"
+              android:textSize="25dip"
+              android:textStyle="bold"
+              android:padding="30dip"
+              android:textColor="#FF555555"
+            />
+</LinearLayout>

=== modified file 'res/menu/main_longclick.xml'
--- res/menu/main_longclick.xml	2011-07-14 03:22:02 +0000
+++ res/menu/main_longclick.xml	2012-03-31 19:28:19 +0000
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:title="@string/view" android:id="@+id/view">
-</item>
-<item android:title="@string/send" android:id="@+id/menu_send">
-</item>
-
-
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/view" android:id="@+id/view"/>
+    <item android:title="@string/send" android:id="@+id/menu_send"/>
+    <item android:title="@string/createShortcut" android:id="@+id/create_shortcut"/>
 </menu>

=== modified file 'res/values-pl/strings.xml'
--- res/values-pl/strings.xml	2012-03-05 12:44:17 +0000
+++ res/values-pl/strings.xml	2012-03-31 19:28:19 +0000
@@ -98,6 +98,10 @@
 	<string name="textModified">Data modyfikacji:</string>
 	<string name="textToday">Dziś</string>
 	<string name="textYexterday">Wczoraj</string>
+
+	<!-- Shortcuts handling -->
+	<string name="shortcuts_view_caption">Wybierz notatkę</string>
+	<string name="shortcut_menu_item_caption">Notatka Tomdroid</string>
 	
 	<!-- 
 	Information that goes into the Android Market Application Listing. 

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2011-12-06 21:55:30 +0000
+++ res/values/strings.xml	2012-03-31 19:28:19 +0000
@@ -67,6 +67,9 @@
 	<string name="messageSyncAlreadyInProgress">Sync already in progress</string>
 	<string name="messageSyncError">There was an error trying to parse your note collection. If you are able to replicate the problem, please contact us!</string>
 	<string name="error">Error</string>
+	<string name="titleNoteNotFound">No Such Note</string>
+	<string name="messageNoteNotFound">The requested note could not be found. Maybe it was deleted or removed throug
+	h synchronization.</string>
 	
 	<!-- NoteSorting -->
 	<string name="menuSort">change sort</string>
@@ -98,6 +101,12 @@
 	<string name="textModified">Modified:</string>
 	<string name="textToday">Today</string>
 	<string name="textYexterday">Yesterday</string>
+
+	<!-- Shortcuts handling -->
+	<string name="shortcuts_view_caption">Choose Note</string>
+	<string name="shortcut_menu_item_caption">Tomdroid Note</string>
+	<string name="btnRemoveShortcut">Remove shortcut</string>
+	<string name="createShortcut">Create shortcut</string>
 	
 	<!-- 
 	Information that goes into the Android Market Application Listing. 

=== modified file 'src/org/tomdroid/ui/Search.java'
--- src/org/tomdroid/ui/Search.java	2011-10-27 16:33:12 +0000
+++ src/org/tomdroid/ui/Search.java	2012-03-31 19:28:19 +0000
@@ -112,7 +112,7 @@
 		Cursor item = (Cursor) adapter.getItem(position);
 		int noteId = item.getInt(item.getColumnIndexOrThrow(Note.ID));
 
-		Uri intentUri = Uri.parse(Tomdroid.CONTENT_URI + "/" + noteId);
+		Uri intentUri = Tomdroid.getNoteIntentUri(noteId);
 		Intent i = new Intent(Intent.ACTION_VIEW, intentUri, this, ViewNote.class);
 		startActivity(i);
 	}

=== added file 'src/org/tomdroid/ui/ShortcutActivity.java'
--- src/org/tomdroid/ui/ShortcutActivity.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/ui/ShortcutActivity.java	2012-03-31 19:28:19 +0000
@@ -0,0 +1,69 @@
+/**
+ Tomdroid
+ Tomboy on Android
+ http://www.launchpad.net/tomdroid
+
+ Copyright 2011 Piotr Adamski <[e-mail]>
+
+ This file is part of Tomdroid.
+
+ Tomdroid is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Tomdroid is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.tomdroid.ui;
+
+import android.app.ListActivity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.util.NoteViewShortcutsHelper;
+import org.tomdroid.util.TLog;
+
+/**
+ * @author Piotr Adamski <[e-mail]>
+ */
+public class ShortcutActivity extends ListActivity {
+    private final String TAG = ShortcutActivity.class.getName();
+    private ListAdapter adapter;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        TLog.d(TAG, "creating shortcut...");
+        setContentView(R.layout.shortcuts_list);
+
+        adapter = NoteManager.getListAdapter(this);
+        setListAdapter(adapter);
+        getListView().setEmptyView(findViewById(R.id.list_empty));
+
+        findViewById(R.id.action_icon).setOnClickListener(new View.OnClickListener() {
+            public void onClick(final View view) {
+                Tomdroid.ViewList(ShortcutActivity.this);
+            }
+        });
+    }
+
+    @Override
+    protected void onListItemClick(final ListView l, final View v, final int position, final long id) {
+        final Cursor item = (Cursor) adapter.getItem(position);
+        final NoteViewShortcutsHelper helper = new NoteViewShortcutsHelper(this);
+        setResult(RESULT_OK, helper.getCreateShortcutIntent(item));
+        finish();
+    }
+}

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2011-10-27 17:15:13 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2012-03-31 19:28:19 +0000
@@ -24,6 +24,17 @@
  */
 package org.tomdroid.ui;
 
+import org.tomdroid.Note;
+import org.tomdroid.NoteManager;
+import org.tomdroid.R;
+import org.tomdroid.sync.ServiceAuth;
+import org.tomdroid.sync.SyncManager;
+import org.tomdroid.sync.SyncService;
+import org.tomdroid.util.FirstNote;
+import org.tomdroid.util.NoteViewShortcutsHelper;
+import org.tomdroid.util.Preferences;
+import org.tomdroid.util.Send;
+
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
@@ -76,6 +87,10 @@
 	// Logging info
 	private static final String	TAG					= "Tomdroid";
 
+    public static Uri getNoteIntentUri(long noteId) {
+        return Uri.parse(CONTENT_URI + "/" + noteId);
+    }
+
 	// UI to data model glue
 	private TextView			listEmptyView;
 	private ListAdapter			adapter;
@@ -117,7 +132,7 @@
 		listEmptyView = (TextView) findViewById(R.id.list_empty);
 		getListView().setEmptyView(listEmptyView);
 		
-		registerForContextMenu((ListView)findViewById(android.R.id.list));
+		registerForContextMenu(findViewById(android.R.id.list));
 	}
 
 	@Override
@@ -163,17 +178,20 @@
 		AdapterContextMenuInfo info = (AdapterContextMenuInfo)item.getMenuInfo();
 		long noteId = info.id;
 		Uri intentUri = Uri.parse(Tomdroid.CONTENT_URI+"/"+noteId);
-		Note note = NoteManager.getNote(this, intentUri);
-		
-		switch (item.getItemId()) {
-			case R.id.menu_send:
-				(new Send(this, note)).send();
+        Note note = NoteManager.getNote(this, intentUri);
+
+        switch (item.getItemId()) {
+            case R.id.menu_send:
+                (new Send(this, note)).send();
 				break;
 			case R.id.view:
 				this.ViewNote(noteId);
 				break;
-				
-			default:
+			case R.id.create_shortcut:
+                final NoteViewShortcutsHelper helper = new NoteViewShortcutsHelper(this);
+                sendBroadcast(helper.getBroadcastableCreateShortcutIntent(intentUri, note.getTitle()));
+                break;
+            default:
 				break;
 		}
 		
@@ -254,7 +272,7 @@
 	}
 	
 	public void ViewNote(long noteId) {
-		Uri intentUri = Uri.parse(Tomdroid.CONTENT_URI + "/" + noteId);
+		Uri intentUri = getNoteIntentUri(noteId);
 		Intent i = new Intent(Intent.ACTION_VIEW, intentUri, this, ViewNote.class);
 		startActivity(i);
 	}

=== modified file 'src/org/tomdroid/ui/ViewNote.java'
--- src/org/tomdroid/ui/ViewNote.java	2011-10-27 16:33:12 +0000
+++ src/org/tomdroid/ui/ViewNote.java	2012-03-31 19:28:19 +0000
@@ -47,6 +47,7 @@
 import org.tomdroid.sync.SyncManager;
 import org.tomdroid.util.LinkifyPhone;
 import org.tomdroid.util.NoteContentBuilder;
+import org.tomdroid.util.NoteViewShortcutsHelper;
 import org.tomdroid.util.Send;
 import org.tomdroid.util.TLog;
 
@@ -55,26 +56,28 @@
 
 // TODO this class is starting to smell
 public class ViewNote extends Activity {
-	
-	// UI elements
+	public static final String CALLED_FROM_SHORTCUT_EXTRA = "org.tomdroid.CALLED_FROM_SHORTCUT";
+    public static final String SHORTCUT_NAME = "org.tomdroid.SHORTCUT_NAME";
+
+    // UI elements
 	private TextView title;
+
 	private TextView content;
-	
-	// Model objects
+    // Model objects
 	private Note note;
+
 	private SpannableStringBuilder noteContent;
-	
+
 	// Logging info
 	private static final String TAG = "ViewNote";
-	
-	// UI feedback handler
+    // UI feedback handler
 	private Handler	syncMessageHandler	= new SyncMessageHandler(this);
 
 	// TODO extract methods in here
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
+
 		setContentView(R.layout.note_view);
 		content = (TextView) findViewById(R.id.content);
 		content.setBackgroundColor(0xffffffff);
@@ -83,68 +86,74 @@
 		title = (TextView) findViewById(R.id.title);
 		title.setTextColor(Color.DKGRAY);
 		title.setTextSize(18.0f);
-		
-		final Intent intent = getIntent();
-		Uri uri = intent.getData();
-		
-		if (uri != null) {
-			
-			// We were triggered by an Intent URI 
-			TLog.d(TAG, "ViewNote started: Intent-filter triggered.");
-
-			// TODO validate the good action?
-			// intent.getAction()
-			
-			// TODO verify that getNote is doing the proper validation
-			note = NoteManager.getNote(this, uri);
-			
-			if(note != null) {
-				
-				noteContent = note.getNoteContent(noteContentHandler);
-				
-				//Log.i(TAG, "THE NOTE IS: " + note.getXmlContent().toString());
-				
-			} else {
-				
-				TLog.d(TAG, "The note {0} doesn't exist", uri);
-				
-				// TODO put error string in a translatable resource
-				new AlertDialog.Builder(this)
-					.setMessage("The requested note could not be found. If you see this error " +
-							    "and you are able to replicate it, please file a bug!")
-					.setTitle("Error")
-					.setNeutralButton("Ok", new OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							dialog.dismiss();
-							finish();
-						}})
-					.show();
-			}
-		} else {
-			
+
+        Uri uri = getIntent().getData();
+
+        if (uri == null) {
 			TLog.d(TAG, "The Intent's data was null.");
-			
-			// TODO put error string in a translatable resource
-			new AlertDialog.Builder(this)
-			.setMessage("The requested note could not be found. If you see this error " +
-					    " and you are able to replicate it, please file a bug!")
-			.setTitle(getString(R.string.error))
-			.setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-					finish();
-				}})
-			.show();
-		}
-	}
-	
+            showNoteNotFoundDialog(uri);
+        } else handleNoteUri(uri);
+    }
+
+    private void handleNoteUri(final Uri uri) {// We were triggered by an Intent URI
+        TLog.d(TAG, "ViewNote started: Intent-filter triggered.");
+
+        // TODO validate the good action?
+        // intent.getAction()
+
+        // TODO verify that getNote is doing the proper validation
+        note = NoteManager.getNote(this, uri);
+
+        if(note != null) {
+            noteContent = note.getNoteContent(noteContentHandler);
+        } else {
+            TLog.d(TAG, "The note "+uri+" doesn't exist");
+            showNoteNotFoundDialog(uri);
+        }
+    }
+
+    private void showNoteNotFoundDialog(final Uri uri) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        addCommonNoteNotFoundDialogElements(builder);
+        addShortcutNoteNotFoundElements(uri, builder);
+        builder.show();
+    }
+
+    private void addShortcutNoteNotFoundElements(final Uri uri, final AlertDialog.Builder builder) {
+        final boolean proposeShortcutRemoval;
+        final boolean calledFromShortcut = getIntent().getBooleanExtra(CALLED_FROM_SHORTCUT_EXTRA, false);
+        final String shortcutName = getIntent().getStringExtra(SHORTCUT_NAME);
+        proposeShortcutRemoval = calledFromShortcut && uri != null && shortcutName != null;
+
+        if (proposeShortcutRemoval) {
+            final Intent removeIntent = new NoteViewShortcutsHelper(this).getRemoveShortcutIntent(shortcutName, uri);
+            builder.setPositiveButton(getString(R.string.btnRemoveShortcut), new OnClickListener() {
+                public void onClick(final DialogInterface dialogInterface, final int i) {
+                    sendBroadcast(removeIntent);
+                    finish();
+                }
+            });
+        }
+    }
+
+    private void addCommonNoteNotFoundDialogElements(final AlertDialog.Builder builder) {
+        builder.setMessage(getString(R.string.messageNoteNotFound))
+                .setTitle(getString(R.string.titleNoteNotFound))
+                .setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                        finish();
+                    }
+                });
+    }
+
 	@Override
 	public void onResume(){
 		super.onResume();
 		SyncManager.setActivity(this);
 		SyncManager.setHandler(this.syncMessageHandler);
 	}
-	
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 
@@ -154,7 +163,7 @@
 		return true;
 
 	}
-	
+
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
@@ -164,42 +173,42 @@
 		}
 		return super.onOptionsItemSelected(item);
 	}
-	
+
 	private void showNote() {
 
 		// show the note (spannable makes the TextView able to output styled text)
 		content.setText(noteContent, TextView.BufferType.SPANNABLE);
 		title.setText((CharSequence) note.getTitle());
-		
+
 		// add links to stuff that is understood by Android except phone numbers because it's too aggressive
 		// TODO this is SLOWWWW!!!!
 		Linkify.addLinks(content, Linkify.EMAIL_ADDRESSES|Linkify.WEB_URLS|Linkify.MAP_ADDRESSES);
-		
+
 		// Custom phone number linkifier (fixes lp:512204)
 		Linkify.addLinks(content, LinkifyPhone.PHONE_PATTERN, "tel:", LinkifyPhone.sPhoneNumberMatchFilter, Linkify.sPhoneNumberTransformFilter);
-		
+
 		// This will create a link every time a note title is found in the text.
 		// The pattern contains a very dumb (title1)|(title2) escaped correctly
 		// Then we transform the url from the note name to the note id to avoid characters that mess up with the URI (ex: ?)
-		Linkify.addLinks(content, 
+		Linkify.addLinks(content,
 						 buildNoteLinkifyPattern(),
 						 Tomdroid.CONTENT_URI+"/",
 						 null,
 						 noteTitleTransformFilter);
 	}
-	
+
 	private Handler noteContentHandler = new Handler() {
 
 		@Override
 		public void handleMessage(Message msg) {
-			
+
 			//parsed ok - show
 			if(msg.what == NoteContentBuilder.PARSE_OK) {
 				showNote();
 
 			//parsed not ok - error
 			} else if(msg.what == NoteContentBuilder.PARSE_ERROR) {
-				
+
 				// TODO put this String in a translatable resource
 				new AlertDialog.Builder(ViewNote.this)
 					.setMessage("The requested note could not be parsed. If you see this error " +
@@ -214,47 +223,47 @@
         	}
 		}
 	};
-	
+
 	/**
 	 * Builds a regular expression pattern that will match any of the note title currently in the collection.
 	 * Useful for the Linkify to create the links to the notes.
 	 * @return regexp pattern
 	 */
 	private Pattern buildNoteLinkifyPattern()  {
-		
+
 		StringBuilder sb = new StringBuilder();
 		Cursor cursor = NoteManager.getTitles(this);
-		
-		// cursor must not be null and must return more than 0 entry 
+
+		// cursor must not be null and must return more than 0 entry
 		if (!(cursor == null || cursor.getCount() == 0)) {
-			
+
 			String title;
-			
+
 			cursor.moveToFirst();
-			
+
 			do {
 				title = cursor.getString(cursor.getColumnIndexOrThrow(Note.TITLE));
-				
-				// Pattern.quote() here make sure that special characters in the note's title are properly escaped 
+
+				// Pattern.quote() here make sure that special characters in the note's title are properly escaped
 				sb.append("("+Pattern.quote(title)+")|");
-				
+
 			} while (cursor.moveToNext());
-			
+
 			// get rid of the last | that is not needed (I know, its ugly.. better idea?)
 			String pt = sb.substring(0, sb.length()-1);
 
 			// return a compiled match pattern
 			return Pattern.compile(pt);
-			
+
 		} else {
-			
+
 			// TODO send an error to the user
 			TLog.d(TAG, "Cursor returned null or 0 notes");
 		}
-		
+
 		return null;
 	}
-	
+
 	// custom transform filter that takes the note's title part of the URI and translate it into the note id
 	// this was done to avoid problems with invalid characters in URI (ex: ? is the query separator but could be in a note title)
 	private TransformFilter noteTitleTransformFilter = new TransformFilter() {
@@ -262,9 +271,9 @@
 		public String transformUrl(Matcher m, String str) {
 
 			int id = NoteManager.getNoteId(ViewNote.this, str);
-			
+
 			// return something like content://org.tomdroid.notes/notes/3
 			return Tomdroid.CONTENT_URI.toString()+"/"+id;
-		}  
+		}
 	};
 }

=== added file 'src/org/tomdroid/util/NoteViewShortcutsHelper.java'
--- src/org/tomdroid/util/NoteViewShortcutsHelper.java	1970-01-01 00:00:00 +0000
+++ src/org/tomdroid/util/NoteViewShortcutsHelper.java	2012-03-31 19:28:19 +0000
@@ -0,0 +1,89 @@
+/**
+ Tomdroid
+ Tomboy on Android
+ http://www.launchpad.net/tomdroid
+
+ Copyright 2011 Piotr Adamski <[e-mail]>
+
+ This file is part of Tomdroid.
+
+ Tomdroid is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Tomdroid is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Tomdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.tomdroid.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import org.tomdroid.Note;
+import org.tomdroid.R;
+import org.tomdroid.ui.Tomdroid;
+import org.tomdroid.ui.ViewNote;
+
+import static android.content.Intent.ShortcutIconResource.fromContext;
+
+/**
+ * @author Piotr Adamski <[e-mail]>
+ */
+public class NoteViewShortcutsHelper {
+    private final Context context;
+
+    public NoteViewShortcutsHelper(final Context context) {
+        this.context = context;
+    }
+
+    public Intent getCreateShortcutIntent(final Cursor item) {
+        final String name = getNoteTitle(item);
+        final Uri uri = Tomdroid.getNoteIntentUri(getNoteId(item));
+        return getCreateShortcutIntent(name, uri);
+    }
+
+    private Intent getCreateShortcutIntent(final String name, final Uri uri) {
+        Intent i = new Intent();
+        i.putExtra(Intent.EXTRA_SHORTCUT_INTENT, getNoteViewShortcutIntent(name, uri));
+        i.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
+        final Intent.ShortcutIconResource icon = fromContext(context, R.drawable.ic_shortcut);
+        i.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+        return i;
+    }
+
+    public Intent getBroadcastableCreateShortcutIntent(final Uri uri, final String name) {
+        final Intent i = getCreateShortcutIntent(name, uri);
+        i.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+        return i;
+    }
+
+    public Intent getRemoveShortcutIntent(final String name, final Uri uri) {
+        final Intent i = new Intent();
+        i.putExtra(Intent.EXTRA_SHORTCUT_INTENT, getNoteViewShortcutIntent(name, uri));
+        i.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
+        i.setAction("com.android.launcher.action.UNINSTALL_SHORTCUT");
+        return i;
+    }
+
+    private Intent getNoteViewShortcutIntent(final String name, final Uri intentUri) {
+        final Intent i = new Intent(Intent.ACTION_VIEW, intentUri, context, ViewNote.class);
+        i.putExtra(ViewNote.CALLED_FROM_SHORTCUT_EXTRA, true);
+        i.putExtra(ViewNote.SHORTCUT_NAME, name);
+        return i;
+    }
+
+    private String getNoteTitle(final Cursor item) {
+        return item.getString(item.getColumnIndexOrThrow(Note.TITLE));
+    }
+
+    private int getNoteId(final Cursor item) {
+        return item.getInt(item.getColumnIndexOrThrow(Note.ID));
+    }
+}