Android 2.1.0-beta5

pebble · Oct 24, 2014 · 6352d55 · 6352d55
1 parent fae38ed
commit 6352d55
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/ide/static/ide/css/ide.css b/ide/static/ide/css/ide.css
@@ -1,3 +1,8 @@
+/* Temporary, for Android. */
+#android-beta-link {
+    text-decoration: underline;
+}
+
 /* New stuff. */
 
 /* Page layout framework */

diff --git a/ide/static/ide/js/compile.js b/ide/static/ide/js/compile.js
@@ -125,6 +125,10 @@ CloudPebble.Compile = (function() {
             e.preventDefault();
             take_screenshot();
         });
+        pane.find('#android-beta-link').click(function(e) {
+            e.preventDefault();
+            $('#modal-android-notes').modal();
+        });
         mCrashAnalyser = new CloudPebble.CrashChecker(CloudPebble.ProjectInfo.app_uuid);
         pane.find('#compilation-run-build-button').click(function() { run_build(); });
     };

diff --git a/ide/templates/ide/project.html b/ide/templates/ide/project.html
@@ -370,6 +370,39 @@ <h3>Doing a thing…</h3>
         </div>
     </div>
 </div>
+<!-- Android 2.1 beta download prompt -->
+<div id="modal-android-notes" class="modal hide fade" tabindex="-1" role="dialog">
+    <div class="modal-header">
+        <h3 id="modal-warning-prompt-title">Android App v2.1.0-beta5</h3>
+    </div>
+    <div class="modal-body">
+        <ul>
+            <li>This version of the Pebble Android app has been rewritten from the ground up to be more reliable
+                and give a better user experience.</li>
+            <li>Notifications are now available from all apps. You should now disable Pebble Notifier or similar apps
+                <ul>
+                    <li>The new <em>Notifications</em> menu includes an <em>All apps</em> option, where you can choose
+                        to receive notifications from any app on your device.</li>
+                    <li>Some popular apps are selected by default.</li>
+                    <li>Some apps in this list will be disabled if you have enabled built-in notifications (e.g. Gmail
+                        or calendar) to avoid generating duplicate notifications.</li>
+                </ul>
+            </li>
+            <li>In-progress phone calls can now be ended from your watch.</li>
+        </ul>
+        <strong>Please note:</strong>
+        <ul>
+            <li>This release is only supported on Android 4.3 and above.</li>
+            <li>Developers: datalogging compatibility is broken in this release. You will need to use the updated
+                PebbleKit 2.6 in order to use datalogging with this release.</li>
+            <li>You will be asked to log in to your Pebble account again after installing this release.</li>
+        </ul>
+    </div>
+    <div class="modal-footer">
+        <button class="btn" data-dismiss="modal">{% trans 'Dismiss' %}</button>
+        <a href="https://www.dropbox.com/s/8qs98nhazxuc24l/pebble-release-2.1.0-beta5-510.apk" class="btn btn-primary">{% trans 'Download' %}</a>
+    </div>
+</div>
 {% endblock %}
 
 {% block scripts %}

diff --git a/ide/templates/ide/project/compile.html b/ide/templates/ide/project/compile.html
@@ -7,7 +7,7 @@
                 <div class="control-group text-center">
                     <p>
                         {% blocktrans %}Make sure that the Developer Connection is enabled on your phone, and you are
-running at least iOS app version 2.5 or Android version 2.1 (beta).{% endblocktrans %}
+running at least phone app version 2.5 (iOS) or <a id="android-beta-link" href="#">2.1.0-beta5 (Android)</a>.{% endblocktrans %}
                     </p>
                 </div>
                 <hr>