Commit 6c9c0ff4d1d8b4de6a2b5594366dd7ee1804ad10

  • avatar
  • egaudet
  • Fri Oct 02 02:57:28 CEST 2009
Regenerated patches to remove trailing CRs and ignore space changes
  
1Index: /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 @@
1diff --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
2index 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() {
45diff --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
46index 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){
650 PageAssistant.prototype._streamResource = function(uri, appid, mimeType){
751
852 Mojo.Log.info("Streaming: '%s' with '%s' (%s)", uri, appid, mimeType);
953-
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
2754+ if(appid === 'com.palm.app.email')
2855+ {
2956+ //an email was clicked, so we bypass the download dialog and open the email app.
140140+ this._downloadResource(uri);
141141+ }.bind(this),
142142+ 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 {
152155+ } 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){
160160 }
161- });
162- }
161 });
162 }
163163+ }.bind(this)})
164164+ });
165165+
166166 };
167167
168168 /**
169@@ -2237,7 +2326,32 @@
169@@ -2237,6 +2326,31 @@ PageAssistant.prototype._onKeyDownEvent = function(event) {
170170 // allowed to trigger the bar.
171171 if (this._addressBar.isAGotoAddressBarEvent(event.originalEvent)) {
172172 this._gotoUrlBar();
173- }
174173+ } else {
175174+ var key = event.originalEvent.keyCode;
176175+ var scroller = this.controller.getSceneScroller();
195195+ } else {
196196+ Mojo.Log.error("Ignoring keyCode", key);
197197+ }
198+ }
198 }
199199 }
200200 };
201
202Index: /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 @@
201diff --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
202index 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) {
207206 if (orientation !== 'up') {
208207 // In landscape and down we ALWAYS hide the BAR so we make sure it's
209208 // already hidden by calling' 'hide'.
213213 this._hidePortrait();
214214 }
215215
216@@ -73,6 +77,12 @@
216@@ -73,6 +77,12 @@ UrlBar.prototype.setup = function(properties) {
217217 this._onPropertyChange = properties.onPropertyChange || function(){};
218218 this._configOrientation(properties.orientation || 'up');
219219
226226 this.models = {
227227 urlInput: {
228228 template: 'page/url-field',
229@@ -90,7 +100,7 @@
229@@ -90,7 +100,7 @@ UrlBar.prototype.setup = function(properties) {
230230 url: ''
231231 },
232232
235235 },
236236
237237 // Beware: These are shallow copies.
238@@ -416,12 +426,25 @@
238@@ -416,12 +426,25 @@ UrlBar.prototype._hidePortrait = function() {
239239 this.controller.setMenuVisible(Mojo.Menu.viewMenu, false);
240240 };
241241
261261 };
262262
263263 UrlBar.prototype.isVisible = function() {
264Index: /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() {
309Index: /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+});
360Index: /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>
373Index: /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 {
264diff --git a/usr/palm/applications/com.palm.app.browser/sources.json b/usr/palm/applications/com.palm.app.browser/sources.json
265index 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 @@
379269 "source": "app\/controllers\/download-controller.js",
380270 },
381+ {
271 {
382272+ "source":"app\/controllers\/downloaddialog-assistant.js"
383273+ },
384 {
274+ {
385275 "source": "app\/controllers\/preferences-assistant.js",
386276 },
387Index: /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 {
278diff --git a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
279index 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 {
392283 }
393284
394285 .search-results-container .palm-list {
  
1Index: /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 @@
1diff --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
2index 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() {
66 }
77 },
88
5252
5353 Mojo.Log.info("SystemUI Power Payload "+ Object.toJSON(payload));
5454 if(!this.powerdServiceUp) {
55@@ -1453,7 +1492,15 @@
55@@ -1453,7 +1492,15 @@ handlePowerNotifications: function(payload) {
5656 // Show the battery level if not charging
5757 if (!this.isCharging) {
5858 Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging + " Battery level "+ i);
59- $('power').className = 'battery-' + i;
6059+ if (batteryLevelImage == 0) {
61+ $('power').className = 'battery-' + i;
60 $('power').className = 'battery-' + i;
6261+ } else if(batteryLevelImage == 1) {
6362+ $('power').className = 'battery-percent';
6463+ $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 0);
6868
6969 //Show Banner Message if the Battery level is below 20%
7070 var batteryalert = $L("#{percent_ui}% battery remaining").interpolate(payload);
71@@ -1482,10 +1529,23 @@
71@@ -1482,10 +1529,23 @@ handlePowerNotifications: function(payload) {
7272 }
7373 else {
7474 Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging );
7575- if(payload.percent_ui == 100)
76- $('power').className = 'battery-charged';
77- else
78- $('power').className = 'battery-charging-' + i;
7976+ if (batteryLevelImage == 0) {
8077+ 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;
8481+ } else if (batteryLevelImage == 1) {
8582+ $('power').className = 'battery-percent';
8683+ $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1);
9393
9494 }
9595
96@@ -1522,10 +1582,23 @@
96@@ -1522,10 +1582,23 @@ handlePowerNotifications: function(payload) {
9797
9898 if (this.isCharging) {
9999 Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel);
100100- if(this.batteryLevel == 100)
101- $('power').className = 'battery-charged';
102- else
103- $('power').className = 'battery-charging-' + this.lastBatteryLevel;
104101+ if (batteryLevelImage == 0) {
105102+ 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;
109106+ } else if(batteryLevelImage == 1) {
110107+ $('power').className = 'battery-percent';
111108+ $('power').innerHTML = this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1);
118118
119119 var stageController = Mojo.Controller.getAppController().getStageProxy("LowBatteryAlert");
120120 if (stageController) {
121@@ -1546,7 +1619,17 @@
121@@ -1546,7 +1619,17 @@ handlePowerNotifications: function(payload) {
122122 else {
123123 this.chargingBannerShown = false;
124124 Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel);
125- $('power').className = 'battery-' + this.lastBatteryLevel;
126125+ if (batteryLevelImage == 0) {
127+ $('power').className = 'battery-' + this.lastBatteryLevel;
126 $('power').className = 'battery-' + this.lastBatteryLevel;
128127+ }
129128+ else if (batteryLevelImage == 1) {
130129+ $('power').className = 'battery-percent';
136136 Mojo.Controller.getAppController().removeBanner('chargingAlert');
137137 }
138138 }
139Index: /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 @@
139diff --git a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
140index 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 {
144144 margin-left: 2px;
145145 width: 17px;
146146 }
  
1Index: /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 @@
1diff --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
2index 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() {
66 }
77 },
88
5252
5353 Mojo.Log.info("SystemUI Power Payload "+ Object.toJSON(payload));
5454 if(!this.powerdServiceUp) {
55@@ -1453,7 +1492,15 @@
55@@ -1453,7 +1492,15 @@ handlePowerNotifications: function(payload) {
5656 // Show the battery level if not charging
5757 if (!this.isCharging) {
5858 Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging + " Battery level "+ i);
59- $('power').className = 'battery-' + i;
6059+ if (batteryLevelImage == 0) {
61+ $('power').className = 'battery-' + i;
60 $('power').className = 'battery-' + i;
6261+ } else if(batteryLevelImage == 1) {
6362+ $('power').className = 'battery-percent';
6463+ $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 0);
6868
6969 //Show Banner Message if the Battery level is below 20%
7070 var batteryalert = $L("#{percent_ui}% battery remaining").interpolate(payload);
71@@ -1482,10 +1529,23 @@
71@@ -1482,10 +1529,23 @@ handlePowerNotifications: function(payload) {
7272 }
7373 else {
7474 Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging );
7575- if(payload.percent_ui == 100)
76- $('power').className = 'battery-charged';
77- else
78- $('power').className = 'battery-charging-' + i;
7976+ if (batteryLevelImage == 0) {
8077+ 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;
8481+ } else if (batteryLevelImage == 1) {
8582+ $('power').className = 'battery-percent';
8683+ $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1);
9393
9494 }
9595
96@@ -1522,10 +1582,23 @@
96@@ -1522,10 +1582,23 @@ handlePowerNotifications: function(payload) {
9797
9898 if (this.isCharging) {
9999 Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel);
100100- if(this.batteryLevel == 100)
101- $('power').className = 'battery-charged';
102- else
103- $('power').className = 'battery-charging-' + this.lastBatteryLevel;
104101+ if (batteryLevelImage == 0) {
105102+ 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;
109106+ } else if(batteryLevelImage == 1) {
110107+ $('power').className = 'battery-percent';
111108+ $('power').innerHTML = this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1);
118118
119119 var stageController = Mojo.Controller.getAppController().getStageProxy("LowBatteryAlert");
120120 if (stageController) {
121@@ -1546,7 +1619,17 @@
121@@ -1546,7 +1619,17 @@ handlePowerNotifications: function(payload) {
122122 else {
123123 this.chargingBannerShown = false;
124124 Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel);
125- $('power').className = 'battery-' + this.lastBatteryLevel;
126125+ if (batteryLevelImage == 0) {
127+ $('power').className = 'battery-' + this.lastBatteryLevel;
126 $('power').className = 'battery-' + this.lastBatteryLevel;
128127+ }
129128+ else if (batteryLevelImage == 1) {
130129+ $('power').className = 'battery-percent';
136136 Mojo.Controller.getAppController().removeBanner('chargingAlert');
137137 }
138138 }
139Index: /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 }
  
1Index: /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 @@
1diff --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
2index 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({
66 */
77 kQuickLaunchHeight: 67,
88
1111 kPageMargin: 10, /* 10 pixel margin on each side of a page */
1212 kPageWidthNoMargin: NaN,
1313 kPageWidth: NaN,
14@@ -324,9 +324,9 @@
14@@ -324,9 +324,9 @@ var LauncherAssistant = Class.create({
1515 var newAppDiv = $(newAppInfo.launchPointId);
1616 Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId);
1717 if (isNaN(this.kAppWidth) || isNaN(this.kAppHeight)) {
2424 }
2525
2626 Mojo.listen(newAppDiv, Mojo.Event.tap, this.onAppTapped.bindAsEventListener(this));
27@@ -439,7 +439,7 @@
27@@ -439,7 +439,7 @@ var LauncherAssistant = Class.create({
2828 /* determines the position of an app element at appIndex within a page */
2929 calculateAppPosition: function(appIndex) {
3030 return {
3333 top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight)
3434 };
3535 },
36Index: /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 @@
36diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
37index 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
4141
4242 .launcher_page .name {
4343 position:absolute;
4848 height: 34px;
4949 max-height: 34px;
5050 clear:both;
51@@ -130,7 +130,8 @@
51@@ -130,7 +130,8 @@ body.palm-default
5252 color:white;
5353 text-align:center;
5454 font-weight:bold;
5858 overflow: hidden;
5959 text-overflow: ellipsis;
6060 z-index:5;
61@@ -164,8 +165,8 @@
61@@ -164,8 +165,8 @@ body.palm-default
6262 }
6363
6464 .draggable {
6969 margin: 0 auto;
7070 -webkit-user-drag: any;
7171 -webkit-user-select: none;
72@@ -213,8 +214,8 @@
72@@ -213,8 +214,8 @@ body.palm-default
7373
7474 #app-icon {
7575 float:left;
  
1Index: /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 @@
1diff --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
2index 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({
66 if (ChatFlags.isOutgoing(msg.flags)) {
77 tmpClass.push("my-chat");
88 // Disabling MY avatar because we are not doing this for 1.0 2008-11-05
1111 } else {
1212 tmpClass.push("their-chat");
1313 msg.avatar = this.avatarHash[msg.fromAddress] || this.contactAvatar || "images/list-view-default-avatar.png";
14Index: /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 @@
14diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
15index 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 {
1919 }
2020
2121 .chatRow img.avatar-location {
3434 }
3535
3636 .login-animation-available,
37@@ -664,9 +659,7 @@
37@@ -664,9 +659,7 @@ img.avatar-overlay {
3838 padding: 1px 0;
3939 font-size: 18px;
4040 word-wrap: break-word !important;
4545 }
4646 .their-chat .avatar {
4747 width: 40px;
48@@ -675,8 +668,6 @@
48@@ -675,8 +668,6 @@ img.avatar-overlay {
4949
5050 /* Disabling MY avatar because we are not doing this for 1.0 2008-11-05*/
5151 .my-chat .avatar-location,
  
1Index: /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 @@
1diff --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
2index 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({
66 this.stageController = Mojo.Controller.getAppController().getStageController("PhoneApp");
77 this.telListener = this.appAssistant.telephonyEventListener;
88 // if it's true, then we hide call length
  
1Index: /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 @@
1diff --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
2index 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({
66 sliderattributes: {
77 modelProperty: 'value',
88 maxValue: 100,