Commit 6c9c0ff4d1d8b4de6a2b5594366dd7ee1804ad10
- Diff rendering mode:
- inline
- side by side
browser/enable-browser-downloads.patch
(90 / 174)
|   | |||
| 1 | Index: /usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 4 | +++ /usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 5 | @@ -1198,27 +1198,116 @@ | ||
| 1 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js b/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js | ||
| 2 | index 4e0f974..fc1520d 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js | ||
| 5 | @@ -102,12 +102,39 @@ Chrome.prototype._hidePortrait = function() { | ||
| 6 | } | ||
| 7 | }; | ||
| 8 | |||
| 9 | +Chrome.prototype.show = UrlBar.prototype._showNoOp; | ||
| 10 | +Chrome.prototype.hide = UrlBar.prototype._hideNoOp; | ||
| 11 | + | ||
| 12 | Chrome.prototype._showNoOp = function() { | ||
| 13 | // DO NOTHING - We don't show anything in landscape. | ||
| 14 | + var animator; | ||
| 15 | + var element = this.controller.get(this._elementName); | ||
| 16 | + | ||
| 17 | + // If we are visible then the current spacer height is | ||
| 18 | + if (element && (this._currentHeight === 0)) { | ||
| 19 | + animator = Mojo.Animation.animateStyle(element, 'height', 'linear', { | ||
| 20 | + from: 0, | ||
| 21 | + to: this._maxHeight, | ||
| 22 | + duration: 0.15, | ||
| 23 | + reverse: false | ||
| 24 | + }); | ||
| 25 | + this._currentHeight = this._maxHeight; | ||
| 26 | + } | ||
| 27 | }; | ||
| 28 | |||
| 29 | Chrome.prototype._hideNoOp = function() { | ||
| 30 | // DO NOTHING - We should not be displayed in landscape. | ||
| 31 | + var animator; | ||
| 32 | + var element = this.controller.get(this._elementName); | ||
| 33 | + if (element && (this._currentHeight > 0)) { | ||
| 34 | + animator = Mojo.Animation.animateStyle(element, 'height', 'linear', { | ||
| 35 | + from: 0, | ||
| 36 | + to: this._maxHeight, | ||
| 37 | + duration: 0.15, | ||
| 38 | + reverse: true | ||
| 39 | + }); | ||
| 40 | + this._currentHeight = 0; | ||
| 41 | + } | ||
| 42 | }; | ||
| 43 | |||
| 44 | Chrome.prototype.isVisible = function() { | ||
| 45 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 46 | index a805d2c..1074480 100644 | ||
| 47 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 48 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
| 49 | @@ -1198,7 +1198,95 @@ PageAssistant.prototype._newBrowserPage = function(url, pageIdentifier){ | ||
| 6 | 50 | PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ | |
| 7 | 51 | ||
| 8 | 52 | Mojo.Log.info("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType); | |
| 9 | 53 | - | |
| 10 | - // Only a few select applications can be | ||
| 11 | - crossAppScene = { | ||
| 12 | - 'com.palm.app.videoplayer': 'nowplaying', | ||
| 13 | - 'com.palm.app.streamingmusicplayer': 'nowplaying' | ||
| 14 | - }; | ||
| 15 | - var params = {target: uri, mimeType: mimeType}; | ||
| 16 | - if (crossAppScene[appid]) { | ||
| 17 | - | ||
| 18 | - var args = { appId: appid, name: crossAppScene[appid] }; | ||
| 19 | - this.controller.stageController.pushScene(args, params); | ||
| 20 | - } | ||
| 21 | - else { | ||
| 22 | - this.controller.serviceRequest('palm://com.palm.applicationManager', { | ||
| 23 | - method: 'open', | ||
| 24 | - parameters: { | ||
| 25 | - 'id': appid, | ||
| 26 | - 'params': params | ||
| 27 | 54 | + if(appid === 'com.palm.app.email') | |
| 28 | 55 | + { | |
| 29 | 56 | + //an email was clicked, so we bypass the download dialog and open the email app. | |
| … | … | ||
| 140 | 140 | + this._downloadResource(uri); | |
| 141 | 141 | + }.bind(this), | |
| 142 | 142 | + onAccept: function(cParams) { // STREAM | |
| 143 | + // Only a few select applications can be | ||
| 144 | + crossAppScene = { | ||
| 145 | + 'com.palm.app.videoplayer': 'nowplaying', | ||
| 146 | + 'com.palm.app.streamingmusicplayer': 'nowplaying' | ||
| 147 | + }; | ||
| 148 | + var params = {target: uri, mimeType: mimeType}; | ||
| 149 | + if (crossAppScene[appid]) { | ||
| 150 | + var args = { appId: appid, name: crossAppScene[appid] }; | ||
| 151 | + this.controller.stageController.pushScene(args, params); | ||
| 143 | // Only a few select applications can be | ||
| 144 | crossAppScene = { | ||
| 145 | 'com.palm.app.videoplayer': 'nowplaying', | ||
| 146 | @@ -1206,11 +1294,9 @@ PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ | ||
| 147 | }; | ||
| 148 | var params = {target: uri, mimeType: mimeType}; | ||
| 149 | if (crossAppScene[appid]) { | ||
| 150 | - | ||
| 151 | var args = { appId: appid, name: crossAppScene[appid] }; | ||
| 152 | this.controller.stageController.pushScene(args, params); | ||
| 153 | - } | ||
| 154 | - else { | ||
| 152 | 155 | + } else { | |
| 153 | + this.controller.serviceRequest('palm://com.palm.applicationManager', { | ||
| 154 | + method: 'open', | ||
| 155 | + parameters: { | ||
| 156 | + 'id': appid, | ||
| 157 | + 'params': params | ||
| 158 | + } | ||
| 159 | + }); | ||
| 156 | this.controller.serviceRequest('palm://com.palm.applicationManager', { | ||
| 157 | method: 'open', | ||
| 158 | parameters: { | ||
| 159 | @@ -1219,6 +1305,9 @@ PageAssistant.prototype._streamResource = function(uri, appid, mimeType){ | ||
| 160 | 160 | } | |
| 161 | - }); | ||
| 162 | - } | ||
| 161 | }); | ||
| 162 | } | ||
| 163 | 163 | + }.bind(this)}) | |
| 164 | 164 | + }); | |
| 165 | 165 | + | |
| 166 | 166 | }; | |
| 167 | 167 | ||
| 168 | 168 | /** | |
| 169 | @@ -2237,7 +2326,32 @@ | ||
| 169 | @@ -2237,6 +2326,31 @@ PageAssistant.prototype._onKeyDownEvent = function(event) { | ||
| 170 | 170 | // allowed to trigger the bar. | |
| 171 | 171 | if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) { | |
| 172 | 172 | this._gotoUrlBar(); | |
| 173 | - } | ||
| 174 | 173 | + } else { | |
| 175 | 174 | + var key = event.originalEvent.keyCode; | |
| 176 | 175 | + var scroller = this.controller.getSceneScroller(); | |
| … | … | ||
| 195 | 195 | + } else { | |
| 196 | 196 | + Mojo.Log.error("Ignoring keyCode", key); | |
| 197 | 197 | + } | |
| 198 | + } | ||
| 198 | } | ||
| 199 | 199 | } | |
| 200 | 200 | }; | |
| 201 | |||
| 202 | Index: /usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js | ||
| 203 | =================================================================== | ||
| 204 | --- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js | ||
| 205 | +++ /usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js | ||
| 206 | @@ -47,6 +47,10 @@ | ||
| 201 | diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js b/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js | ||
| 202 | index 94abd5d..cafa2e4 100644 | ||
| 203 | --- a/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js | ||
| 204 | +++ b/usr/palm/applications/com.palm.app.browser/app/controllers/urlbar.js | ||
| 205 | @@ -47,6 +47,10 @@ UrlBar.prototype.setOrientation = function(orientation) { | ||
| 207 | 206 | if (orientation !== 'up') { | |
| 208 | 207 | // In landscape and down we ALWAYS hide the BAR so we make sure it's | |
| 209 | 208 | // already hidden by calling' 'hide'. | |
| … | … | ||
| 213 | 213 | this._hidePortrait(); | |
| 214 | 214 | } | |
| 215 | 215 | ||
| 216 | @@ -73,6 +77,12 @@ | ||
| 216 | @@ -73,6 +77,12 @@ UrlBar.prototype.setup = function(properties) { | ||
| 217 | 217 | this._onPropertyChange = properties.onPropertyChange || function(){}; | |
| 218 | 218 | this._configOrientation(properties.orientation || 'up'); | |
| 219 | 219 | ||
| … | … | ||
| 226 | 226 | this.models = { | |
| 227 | 227 | urlInput: { | |
| 228 | 228 | template: 'page/url-field', | |
| 229 | @@ -90,7 +100,7 @@ | ||
| 229 | @@ -90,7 +100,7 @@ UrlBar.prototype.setup = function(properties) { | ||
| 230 | 230 | url: '' | |
| 231 | 231 | }, | |
| 232 | 232 | ||
| … | … | ||
| 235 | 235 | }, | |
| 236 | 236 | ||
| 237 | 237 | // Beware: These are shallow copies. | |
| 238 | @@ -416,12 +426,25 @@ | ||
| 238 | @@ -416,12 +426,25 @@ UrlBar.prototype._hidePortrait = function() { | ||
| 239 | 239 | this.controller.setMenuVisible(Mojo.Menu.viewMenu, false); | |
| 240 | 240 | }; | |
| 241 | 241 | ||
| … | … | ||
| 261 | 261 | }; | |
| 262 | 262 | ||
| 263 | 263 | UrlBar.prototype.isVisible = function() { | |
| 264 | Index: /usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js | ||
| 265 | =================================================================== | ||
| 266 | --- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js | ||
| 267 | +++ /usr/palm/applications/com.palm.app.browser/app/controllers/chrome.js | ||
| 268 | @@ -102,12 +102,39 @@ | ||
| 269 | } | ||
| 270 | }; | ||
| 271 | |||
| 272 | +Chrome.prototype.show = UrlBar.prototype._showNoOp; | ||
| 273 | +Chrome.prototype.hide = UrlBar.prototype._hideNoOp; | ||
| 274 | + | ||
| 275 | Chrome.prototype._showNoOp = function() { | ||
| 276 | - // DO NOTHING - We don't show anything in landscape. | ||
| 277 | + // DO NOTHING - We don't show anything in landscape. | ||
| 278 | + var animator; | ||
| 279 | + var element = this.controller.get(this._elementName); | ||
| 280 | + | ||
| 281 | + // If we are visible then the current spacer height is | ||
| 282 | + if (element && (this._currentHeight === 0)) { | ||
| 283 | + animator = Mojo.Animation.animateStyle(element, 'height', 'linear', { | ||
| 284 | + from: 0, | ||
| 285 | + to: this._maxHeight, | ||
| 286 | + duration: 0.15, | ||
| 287 | + reverse: false | ||
| 288 | + }); | ||
| 289 | + this._currentHeight = this._maxHeight; | ||
| 290 | + } | ||
| 291 | }; | ||
| 292 | |||
| 293 | Chrome.prototype._hideNoOp = function() { | ||
| 294 | // DO NOTHING - We should not be displayed in landscape. | ||
| 295 | + var animator; | ||
| 296 | + var element = this.controller.get(this._elementName); | ||
| 297 | + if (element && (this._currentHeight > 0)) { | ||
| 298 | + animator = Mojo.Animation.animateStyle(element, 'height', 'linear', { | ||
| 299 | + from: 0, | ||
| 300 | + to: this._maxHeight, | ||
| 301 | + duration: 0.15, | ||
| 302 | + reverse: true | ||
| 303 | + }); | ||
| 304 | + this._currentHeight = 0; | ||
| 305 | + } | ||
| 306 | }; | ||
| 307 | |||
| 308 | Chrome.prototype.isVisible = function() { | ||
| 309 | Index: /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js | ||
| 310 | =================================================================== | ||
| 311 | --- /dev/null | ||
| 312 | +++ /usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js | ||
| 313 | @@ -0,0 +1,46 @@ | ||
| 314 | +/** | ||
| 315 | + * A dialog assistant for display of yes/no box. | ||
| 316 | + */ | ||
| 317 | +DownloadDialogAssistant = Class.create({ | ||
| 318 | + | ||
| 319 | + initialize: function(params) { | ||
| 320 | + this.onDismiss = params.onDismiss; | ||
| 321 | + this.onAccept = params.onAccept; | ||
| 322 | + this.controller= params.sceneAssistant.controller; | ||
| 323 | + | ||
| 324 | + // Button handlers. | ||
| 325 | + this.onDismissHandler = this.handleDismiss.bindAsEventListener(this); | ||
| 326 | + this.onAcceptHandler = this.handleAccept.bindAsEventListener(this); | ||
| 327 | + }, | ||
| 328 | + | ||
| 329 | + setup: function(widget) { | ||
| 330 | + this.widget = widget; | ||
| 331 | + this.controller.get('acceptButton').addEventListener(Mojo.Event.tap, this.onAcceptHandler); | ||
| 332 | + this.controller.get('acceptButton').focus(); | ||
| 333 | + this.controller.get('dismissButton').addEventListener(Mojo.Event.tap, this.onDismissHandler); | ||
| 334 | + this.controller.get('dismissButton').focus(); | ||
| 335 | + }, | ||
| 336 | + | ||
| 337 | + handleDismiss: function() { | ||
| 338 | + this.onDismiss(); | ||
| 339 | + delete this.onDismiss; | ||
| 340 | + this.widget.mojo.close(); | ||
| 341 | + }, | ||
| 342 | + handleAccept: function() { | ||
| 343 | + this.onAccept(); | ||
| 344 | + delete this.onAccept; | ||
| 345 | + delete this.onDismiss; | ||
| 346 | + this.widget.mojo.close(); | ||
| 347 | + }, | ||
| 348 | + | ||
| 349 | + cleanup: function() { | ||
| 350 | + Mojo.Log.info("NetworkDialogAssistant#cleanup()"); | ||
| 351 | + Mojo.Event.stopListening(this.controller.get('dismissButton'), Mojo.Event.tap, this.onDismissHandler); | ||
| 352 | + Mojo.Event.stopListening(this.controller.get('acceptButton'), Mojo.Event.tap, this.onAcceptHandler); | ||
| 353 | + | ||
| 354 | + // Send a dismiss if NOT already sent a response | ||
| 355 | + if (this.onDismiss) { | ||
| 356 | + this.onDismiss(); | ||
| 357 | + } | ||
| 358 | + } | ||
| 359 | +}); | ||
| 360 | Index: /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html | ||
| 361 | =================================================================== | ||
| 362 | --- /dev/null | ||
| 363 | +++ /usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html | ||
| 364 | @@ -0,0 +1,8 @@ | ||
| 365 | +<div id="palm-dialog-content" class="palm-dialog-content"> | ||
| 366 | + <div class="dialog-message" x-mojo-loc="">This file type has been registered as a streaming media file. Would you like to download it to /media/internal/downloads instead?</div> | ||
| 367 | +</div> | ||
| 368 | + | ||
| 369 | +<div class="palm-dialog-buttons"> | ||
| 370 | + <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Stream</div> | ||
| 371 | + <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Download</div> | ||
| 372 | +</div> | ||
| 373 | Index: /usr/palm/applications/com.palm.app.browser/sources.json | ||
| 374 | =================================================================== | ||
| 375 | --- .orig/usr/palm/applications/com.palm.app.browser/sources.json | ||
| 376 | +++ /usr/palm/applications/com.palm.app.browser/sources.json | ||
| 377 | @@ -47,6 +47,9 @@ | ||
| 378 | { | ||
| 264 | diff --git a/usr/palm/applications/com.palm.app.browser/sources.json b/usr/palm/applications/com.palm.app.browser/sources.json | ||
| 265 | index 54187ce..7d79e70 100644 | ||
| 266 | --- a/usr/palm/applications/com.palm.app.browser/sources.json | ||
| 267 | +++ b/usr/palm/applications/com.palm.app.browser/sources.json | ||
| 268 | @@ -48,6 +48,9 @@ | ||
| 379 | 269 | "source": "app\/controllers\/download-controller.js", | |
| 380 | 270 | }, | |
| 381 | + { | ||
| 271 | { | ||
| 382 | 272 | + "source":"app\/controllers\/downloaddialog-assistant.js" | |
| 383 | 273 | + }, | |
| 384 | { | ||
| 274 | + { | ||
| 385 | 275 | "source": "app\/controllers\/preferences-assistant.js", | |
| 386 | 276 | }, | |
| 387 | Index: /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css | ||
| 388 | =================================================================== | ||
| 389 | --- .orig/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css | ||
| 390 | +++ /usr/palm/applications/com.palm.app.browser/stylesheets/browser.css | ||
| 391 | @@ -753,7 +753,7 @@ | ||
| 277 | { | ||
| 278 | diff --git a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css | ||
| 279 | index 6215e0b..aee8654 100644 | ||
| 280 | --- a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css | ||
| 281 | +++ b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css | ||
| 282 | @@ -753,7 +753,7 @@ div#historyScroller { | ||
| 392 | 283 | } | |
| 393 | 284 | ||
| 394 | 285 | .search-results-container .palm-list { |
luna/battery-percent-and-icon.patch
(22 / 30)
|   | |||
| 1 | Index: /usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ /usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -1430,10 +1430,49 @@ | ||
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index ee479ac..c2447db 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -1430,10 +1430,49 @@ closePbapAlert: function() { | ||
| 6 | 6 | } | |
| 7 | 7 | }, | |
| 8 | 8 | ||
| … | … | ||
| 52 | 52 | ||
| 53 | 53 | Mojo.Log.info("SystemUI Power Payload "+ Object.toJSON(payload)); | |
| 54 | 54 | if(!this.powerdServiceUp) { | |
| 55 | @@ -1453,7 +1492,15 @@ | ||
| 55 | @@ -1453,7 +1492,15 @@ handlePowerNotifications: function(payload) { | ||
| 56 | 56 | // Show the battery level if not charging | |
| 57 | 57 | if (!this.isCharging) { | |
| 58 | 58 | Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging + " Battery level "+ i); | |
| 59 | - $('power').className = 'battery-' + i; | ||
| 60 | 59 | + if (batteryLevelImage == 0) { | |
| 61 | + $('power').className = 'battery-' + i; | ||
| 60 | $('power').className = 'battery-' + i; | ||
| 62 | 61 | + } else if(batteryLevelImage == 1) { | |
| 63 | 62 | + $('power').className = 'battery-percent'; | |
| 64 | 63 | + $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 0); | |
| … | … | ||
| 68 | 68 | ||
| 69 | 69 | //Show Banner Message if the Battery level is below 20% | |
| 70 | 70 | var batteryalert = $L("#{percent_ui}% battery remaining").interpolate(payload); | |
| 71 | @@ -1482,10 +1529,23 @@ | ||
| 71 | @@ -1482,10 +1529,23 @@ handlePowerNotifications: function(payload) { | ||
| 72 | 72 | } | |
| 73 | 73 | else { | |
| 74 | 74 | Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging ); | |
| 75 | 75 | - if(payload.percent_ui == 100) | |
| 76 | - $('power').className = 'battery-charged'; | ||
| 77 | - else | ||
| 78 | - $('power').className = 'battery-charging-' + i; | ||
| 79 | 76 | + if (batteryLevelImage == 0) { | |
| 80 | 77 | + if (payload.percent_ui == 100) | |
| 81 | + $('power').className = 'battery-charged'; | ||
| 82 | + else | ||
| 83 | + $('power').className = 'battery-charging-' + i; | ||
| 78 | $('power').className = 'battery-charged'; | ||
| 79 | else | ||
| 80 | $('power').className = 'battery-charging-' + i; | ||
| 84 | 81 | + } else if (batteryLevelImage == 1) { | |
| 85 | 82 | + $('power').className = 'battery-percent'; | |
| 86 | 83 | + $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1); | |
| … | … | ||
| 93 | 93 | ||
| 94 | 94 | } | |
| 95 | 95 | ||
| 96 | @@ -1522,10 +1582,23 @@ | ||
| 96 | @@ -1522,10 +1582,23 @@ handlePowerNotifications: function(payload) { | ||
| 97 | 97 | ||
| 98 | 98 | if (this.isCharging) { | |
| 99 | 99 | Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel); | |
| 100 | 100 | - if(this.batteryLevel == 100) | |
| 101 | - $('power').className = 'battery-charged'; | ||
| 102 | - else | ||
| 103 | - $('power').className = 'battery-charging-' + this.lastBatteryLevel; | ||
| 104 | 101 | + if (batteryLevelImage == 0) { | |
| 105 | 102 | + if (this.batteryLevel == 100) | |
| 106 | + $('power').className = 'battery-charged'; | ||
| 107 | + else | ||
| 108 | + $('power').className = 'battery-charging-' + this.lastBatteryLevel; | ||
| 103 | $('power').className = 'battery-charged'; | ||
| 104 | else | ||
| 105 | $('power').className = 'battery-charging-' + this.lastBatteryLevel; | ||
| 109 | 106 | + } else if(batteryLevelImage == 1) { | |
| 110 | 107 | + $('power').className = 'battery-percent'; | |
| 111 | 108 | + $('power').innerHTML = this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1); | |
| … | … | ||
| 118 | 118 | ||
| 119 | 119 | var stageController = Mojo.Controller.getAppController().getStageProxy("LowBatteryAlert"); | |
| 120 | 120 | if (stageController) { | |
| 121 | @@ -1546,7 +1619,17 @@ | ||
| 121 | @@ -1546,7 +1619,17 @@ handlePowerNotifications: function(payload) { | ||
| 122 | 122 | else { | |
| 123 | 123 | this.chargingBannerShown = false; | |
| 124 | 124 | Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel); | |
| 125 | - $('power').className = 'battery-' + this.lastBatteryLevel; | ||
| 126 | 125 | + if (batteryLevelImage == 0) { | |
| 127 | + $('power').className = 'battery-' + this.lastBatteryLevel; | ||
| 126 | $('power').className = 'battery-' + this.lastBatteryLevel; | ||
| 128 | 127 | + } | |
| 129 | 128 | + else if (batteryLevelImage == 1) { | |
| 130 | 129 | + $('power').className = 'battery-percent'; | |
| … | … | ||
| 136 | 136 | Mojo.Controller.getAppController().removeBanner('chargingAlert'); | |
| 137 | 137 | } | |
| 138 | 138 | } | |
| 139 | Index: /usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 140 | =================================================================== | ||
| 141 | --- .orig/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 142 | +++ /usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 143 | @@ -136,6 +136,22 @@ | ||
| 139 | diff --git a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 140 | index 58b22e8..b23eab5 100644 | ||
| 141 | --- a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 142 | +++ b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 143 | @@ -136,6 +136,22 @@ body.palm-default { | ||
| 144 | 144 | margin-left: 2px; | |
| 145 | 145 | width: 17px; | |
| 146 | 146 | } |
luna/battery-percent.patch
(17 / 52)
|   | |||
| 1 | Index: /usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ /usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -1430,10 +1430,49 @@ | ||
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index ee479ac..6f21c54 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -1430,10 +1430,49 @@ closePbapAlert: function() { | ||
| 6 | 6 | } | |
| 7 | 7 | }, | |
| 8 | 8 | ||
| … | … | ||
| 52 | 52 | ||
| 53 | 53 | Mojo.Log.info("SystemUI Power Payload "+ Object.toJSON(payload)); | |
| 54 | 54 | if(!this.powerdServiceUp) { | |
| 55 | @@ -1453,7 +1492,15 @@ | ||
| 55 | @@ -1453,7 +1492,15 @@ handlePowerNotifications: function(payload) { | ||
| 56 | 56 | // Show the battery level if not charging | |
| 57 | 57 | if (!this.isCharging) { | |
| 58 | 58 | Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging + " Battery level "+ i); | |
| 59 | - $('power').className = 'battery-' + i; | ||
| 60 | 59 | + if (batteryLevelImage == 0) { | |
| 61 | + $('power').className = 'battery-' + i; | ||
| 60 | $('power').className = 'battery-' + i; | ||
| 62 | 61 | + } else if(batteryLevelImage == 1) { | |
| 63 | 62 | + $('power').className = 'battery-percent'; | |
| 64 | 63 | + $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 0); | |
| … | … | ||
| 68 | 68 | ||
| 69 | 69 | //Show Banner Message if the Battery level is below 20% | |
| 70 | 70 | var batteryalert = $L("#{percent_ui}% battery remaining").interpolate(payload); | |
| 71 | @@ -1482,10 +1529,23 @@ | ||
| 71 | @@ -1482,10 +1529,23 @@ handlePowerNotifications: function(payload) { | ||
| 72 | 72 | } | |
| 73 | 73 | else { | |
| 74 | 74 | Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging ); | |
| 75 | 75 | - if(payload.percent_ui == 100) | |
| 76 | - $('power').className = 'battery-charged'; | ||
| 77 | - else | ||
| 78 | - $('power').className = 'battery-charging-' + i; | ||
| 79 | 76 | + if (batteryLevelImage == 0) { | |
| 80 | 77 | + if (payload.percent_ui == 100) | |
| 81 | + $('power').className = 'battery-charged'; | ||
| 82 | + else | ||
| 83 | + $('power').className = 'battery-charging-' + i; | ||
| 78 | $('power').className = 'battery-charged'; | ||
| 79 | else | ||
| 80 | $('power').className = 'battery-charging-' + i; | ||
| 84 | 81 | + } else if (batteryLevelImage == 1) { | |
| 85 | 82 | + $('power').className = 'battery-percent'; | |
| 86 | 83 | + $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1); | |
| … | … | ||
| 93 | 93 | ||
| 94 | 94 | } | |
| 95 | 95 | ||
| 96 | @@ -1522,10 +1582,23 @@ | ||
| 96 | @@ -1522,10 +1582,23 @@ handlePowerNotifications: function(payload) { | ||
| 97 | 97 | ||
| 98 | 98 | if (this.isCharging) { | |
| 99 | 99 | Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel); | |
| 100 | 100 | - if(this.batteryLevel == 100) | |
| 101 | - $('power').className = 'battery-charged'; | ||
| 102 | - else | ||
| 103 | - $('power').className = 'battery-charging-' + this.lastBatteryLevel; | ||
| 104 | 101 | + if (batteryLevelImage == 0) { | |
| 105 | 102 | + if (this.batteryLevel == 100) | |
| 106 | + $('power').className = 'battery-charged'; | ||
| 107 | + else | ||
| 108 | + $('power').className = 'battery-charging-' + this.lastBatteryLevel; | ||
| 103 | $('power').className = 'battery-charged'; | ||
| 104 | else | ||
| 105 | $('power').className = 'battery-charging-' + this.lastBatteryLevel; | ||
| 109 | 106 | + } else if(batteryLevelImage == 1) { | |
| 110 | 107 | + $('power').className = 'battery-percent'; | |
| 111 | 108 | + $('power').innerHTML = this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1); | |
| … | … | ||
| 118 | 118 | ||
| 119 | 119 | var stageController = Mojo.Controller.getAppController().getStageProxy("LowBatteryAlert"); | |
| 120 | 120 | if (stageController) { | |
| 121 | @@ -1546,7 +1619,17 @@ | ||
| 121 | @@ -1546,7 +1619,17 @@ handlePowerNotifications: function(payload) { | ||
| 122 | 122 | else { | |
| 123 | 123 | this.chargingBannerShown = false; | |
| 124 | 124 | Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel); | |
| 125 | - $('power').className = 'battery-' + this.lastBatteryLevel; | ||
| 126 | 125 | + if (batteryLevelImage == 0) { | |
| 127 | + $('power').className = 'battery-' + this.lastBatteryLevel; | ||
| 126 | $('power').className = 'battery-' + this.lastBatteryLevel; | ||
| 128 | 127 | + } | |
| 129 | 128 | + else if (batteryLevelImage == 1) { | |
| 130 | 129 | + $('power').className = 'battery-percent'; | |
| … | … | ||
| 136 | 136 | Mojo.Controller.getAppController().removeBanner('chargingAlert'); | |
| 137 | 137 | } | |
| 138 | 138 | } | |
| 139 | Index: /usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 140 | =================================================================== | ||
| 141 | --- .orig/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 142 | +++ /usr/lib/luna/system/luna-systemui/stylesheets/systemui.css | ||
| 143 | @@ -136,6 +136,22 @@ | ||
| 144 | margin-left: 2px; | ||
| 145 | width: 17px; | ||
| 146 | } | ||
| 147 | + | ||
| 148 | +/* Begin: Battery Percent / Image w/ Percent */ | ||
| 149 | +#power.battery-percent { | ||
| 150 | + width: 38px; | ||
| 151 | + background-color: black; | ||
| 152 | +} | ||
| 153 | +#power.battery-percentimage { | ||
| 154 | + width: 49px; | ||
| 155 | + background-color: black; | ||
| 156 | +} | ||
| 157 | +#power.battery-percentimage-charged { | ||
| 158 | + width: 49px; | ||
| 159 | + background-color: black; | ||
| 160 | +} | ||
| 161 | +/* End: Battery Percent / Image w/ Percent */ | ||
| 162 | + | ||
| 163 | #power.error { | ||
| 164 | background: url(../images/battery-error.png) center center no-repeat; | ||
| 165 | } |
luna/launcher-icons-4x4-jason.patch
(15 / 15)
|   | |||
| 1 | Index: /usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 4 | +++ /usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 5 | @@ -10,7 +10,7 @@ | ||
| 1 | diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 2 | index 4da3e85..590fab5 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js | ||
| 5 | @@ -10,7 +10,7 @@ var LauncherAssistant = Class.create({ | ||
| 6 | 6 | */ | |
| 7 | 7 | kQuickLaunchHeight: 67, | |
| 8 | 8 | ||
| … | … | ||
| 11 | 11 | kPageMargin: 10, /* 10 pixel margin on each side of a page */ | |
| 12 | 12 | kPageWidthNoMargin: NaN, | |
| 13 | 13 | kPageWidth: NaN, | |
| 14 | @@ -324,9 +324,9 @@ | ||
| 14 | @@ -324,9 +324,9 @@ var LauncherAssistant = Class.create({ | ||
| 15 | 15 | var newAppDiv = $(newAppInfo.launchPointId); | |
| 16 | 16 | Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId); | |
| 17 | 17 | if (isNaN(this.kAppWidth) || isNaN(this.kAppHeight)) { | |
| … | … | ||
| 24 | 24 | } | |
| 25 | 25 | ||
| 26 | 26 | Mojo.listen(newAppDiv, Mojo.Event.tap, this.onAppTapped.bindAsEventListener(this)); | |
| 27 | @@ -439,7 +439,7 @@ | ||
| 27 | @@ -439,7 +439,7 @@ var LauncherAssistant = Class.create({ | ||
| 28 | 28 | /* determines the position of an app element at appIndex within a page */ | |
| 29 | 29 | calculateAppPosition: function(appIndex) { | |
| 30 | 30 | return { | |
| … | … | ||
| 33 | 33 | top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight) | |
| 34 | 34 | }; | |
| 35 | 35 | }, | |
| 36 | Index: /usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 37 | =================================================================== | ||
| 38 | --- .orig/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 39 | +++ /usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 40 | @@ -121,8 +121,8 @@ | ||
| 36 | diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 37 | index b1244af..0abf90f 100644 | ||
| 38 | --- a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 39 | +++ b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css | ||
| 40 | @@ -121,8 +121,8 @@ body.palm-default | ||
| 41 | 41 | ||
| 42 | 42 | .launcher_page .name { | |
| 43 | 43 | position:absolute; | |
| … | … | ||
| 48 | 48 | height: 34px; | |
| 49 | 49 | max-height: 34px; | |
| 50 | 50 | clear:both; | |
| 51 | @@ -130,7 +130,8 @@ | ||
| 51 | @@ -130,7 +130,8 @@ body.palm-default | ||
| 52 | 52 | color:white; | |
| 53 | 53 | text-align:center; | |
| 54 | 54 | font-weight:bold; | |
| … | … | ||
| 58 | 58 | overflow: hidden; | |
| 59 | 59 | text-overflow: ellipsis; | |
| 60 | 60 | z-index:5; | |
| 61 | @@ -164,8 +165,8 @@ | ||
| 61 | @@ -164,8 +165,8 @@ body.palm-default | ||
| 62 | 62 | } | |
| 63 | 63 | ||
| 64 | 64 | .draggable { | |
| … | … | ||
| 69 | 69 | margin: 0 auto; | |
| 70 | 70 | -webkit-user-drag: any; | |
| 71 | 71 | -webkit-user-select: none; | |
| 72 | @@ -213,8 +214,8 @@ | ||
| 72 | @@ -213,8 +214,8 @@ body.palm-default | ||
| 73 | 73 | ||
| 74 | 74 | #app-icon { | |
| 75 | 75 | float:left; |
messaging/msg-avatar.patch
(12 / 12)
|   | |||
| 1 | Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 4 | +++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 5 | @@ -1347,7 +1347,7 @@ | ||
| 1 | diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 2 | index 4c7cdbe..52563c8 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js | ||
| 5 | @@ -1347,7 +1347,7 @@ var ChatviewAssistant = Class.create({ | ||
| 6 | 6 | if (ChatFlags.isOutgoing(msg.flags)) { | |
| 7 | 7 | tmpClass.push("my-chat"); | |
| 8 | 8 | // Disabling MY avatar because we are not doing this for 1.0 2008-11-05 | |
| … | … | ||
| 11 | 11 | } else { | |
| 12 | 12 | tmpClass.push("their-chat"); | |
| 13 | 13 | msg.avatar = this.avatarHash[msg.fromAddress] || this.contactAvatar || "images/list-view-default-avatar.png"; | |
| 14 | Index: /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 15 | =================================================================== | ||
| 16 | --- .orig/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 17 | +++ /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 18 | @@ -137,16 +137,11 @@ | ||
| 14 | diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 15 | index 13251fe..b624a0f 100644 | ||
| 16 | --- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 17 | +++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css | ||
| 18 | @@ -137,16 +137,11 @@ img.avatar-overlay { | ||
| 19 | 19 | } | |
| 20 | 20 | ||
| 21 | 21 | .chatRow img.avatar-location { | |
| … | … | ||
| 34 | 34 | } | |
| 35 | 35 | ||
| 36 | 36 | .login-animation-available, | |
| 37 | @@ -664,9 +659,7 @@ | ||
| 37 | @@ -664,9 +659,7 @@ img.avatar-overlay { | ||
| 38 | 38 | padding: 1px 0; | |
| 39 | 39 | font-size: 18px; | |
| 40 | 40 | word-wrap: break-word !important; | |
| … | … | ||
| 45 | 45 | } | |
| 46 | 46 | .their-chat .avatar { | |
| 47 | 47 | width: 40px; | |
| 48 | @@ -675,8 +668,6 @@ | ||
| 48 | @@ -675,8 +668,6 @@ img.avatar-overlay { | ||
| 49 | 49 | ||
| 50 | 50 | /* Disabling MY avatar because we are not doing this for 1.0 2008-11-05*/ | |
| 51 | 51 | .my-chat .avatar-location, |
phone/call-duration.patch
(5 / 5)
|   | |||
| 1 | Index: /usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js | ||
| 4 | +++ /usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js | ||
| 5 | @@ -10,7 +10,7 @@ | ||
| 1 | diff --git a/usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js b/usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js | ||
| 2 | index 10d1d80..1efdb7d 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js | ||
| 5 | @@ -10,7 +10,7 @@ var CalllogAssistant = Class.create({ | ||
| 6 | 6 | this.stageController = Mojo.Controller.getAppController().getStageController("PhoneApp"); | |
| 7 | 7 | this.telListener = this.appAssistant.telephonyEventListener; | |
| 8 | 8 | // if it's true, then we hide call length |
|   | |||
| 1 | Index: /usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js | ||
| 2 | =================================================================== | ||
| 3 | --- .orig/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js | ||
| 4 | +++ /usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js | ||
| 5 | @@ -35,7 +35,7 @@ | ||
| 1 | diff --git a/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js b/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js | ||
| 2 | index d6bfe45..5aa36c7 100644 | ||
| 3 | --- a/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js | ||
| 4 | +++ b/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js | ||
| 5 | @@ -35,7 +35,7 @@ var SecurityconfigAssistant = Class.create({ | ||
| 6 | 6 | sliderattributes: { | |
| 7 | 7 | modelProperty: 'value', | |
| 8 | 8 | maxValue: 100, |

