Skip to content

Commit

Permalink
updates and additions
Browse files Browse the repository at this point in the history
  • Loading branch information
www-data committed Feb 24, 2011
1 parent 3388f9a commit 48604e5
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 32 deletions.
10 changes: 5 additions & 5 deletions email/email-actual-words-instead-of-icons.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js b/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js
index 878d9fb..2b4cf38 100644
index 761069e..5d2f22c 100644
--- a/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js
+++ b/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js
@@ -70,10 +70,10 @@ var MessageAssistant = Class.create({
Expand All @@ -10,10 +10,10 @@ index 878d9fb..2b4cf38 100644
- {label:$L('Reply all'), icon:'reply-all', command:'replyAll'},
- {label:$L('Forward'), icon:'forward-email', command:'forward'},
- {label:$L('Delete'), icon:'delete', command:'delete'}
+ {label:$L('Reply'), shortcut:'r', command:'reply'},
+ {label:$L('Reply all'), shortcut:'e', command:'replyAll'},
+ {label:$L('Forward'), shortcut:'f', command:'forward'},
+ {label:$L('Delete'), shortcut:'d', command:'delete'}
+ {label:$L('Reply'), shortcut:'r', command:'reply'},
+ {label:$L('Reply all'), shortcut:'a', command:'replyAll'},
+ {label:$L('Fwd'), shortcut:'f', command:'forward'},
+ {label:$L('Delete'), shortcut:'d', command:'delete'}
]};
this.controller.setupWidget(Mojo.Menu.commandMenu, undefined, this.cmdMenuModel);

52 changes: 25 additions & 27 deletions phone/phone-close-slider-to-end-calls.patch
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Index: /usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js
===================================================================
--- .orig/usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js
+++ /usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js
@@ -20,6 +20,19 @@ var ActivecallAssistant = Class.create({
diff --git a/usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js b/usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js
index bab675d..6cf447a 100644
--- a/usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js
+++ b/usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assistant.js
@@ -24,6 +24,19 @@ var ActivecallAssistant = Class.create({
},

initialize: function(params){
Expand All @@ -12,71 +12,69 @@ Index: /usr/palm/applications/com.palm.app.phone/app/controllers/activecall-assi
+ method: 'status',
+ parameters: {"get" : "slider"},
+ onFailure: function() {
+ QDLogger.log("Slider: Failed to get slider status");
+ Mojo.Log.info("Slider: Failed to get slider status");
+ },
+ onSuccess: this.getSliderPos.bind(this)
+ });
+ this.sliderSubscriptionx = TelephonyCommands.sliderSubscribe(this.onSliderEventDuringCall.bind(this));
+//END Slider Patch block 1 of 3
+
+
this.appAssistant = Mojo.Controller.getAppController().assistant;
this.eventListener = this.appAssistant.telephonyEventListener;
this.announcer = this.appAssistant.announcer;
@@ -139,7 +152,44 @@ var ActivecallAssistant = Class.create({
this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems: false}, appMenuModel);
@@ -67,6 +80,43 @@ var ActivecallAssistant = Class.create({

},
-
+

+//BEGIN Slider Patch block 2 of 3
+ getSliderPos: function(response) {
+ QDLogger.log("****getting slider position****");
+ Mojo.Log.info("****getting slider position****");
+ if (response.key === "slider") {
+ this.sliderPos = response.state;
+ QDLogger.log("Slider Position:", response.state);
+ Mojo.Log.info("Slider Position:", response.state);
+ }
+ },
+ onSliderEventDuringCall: function(response) {
+ if (response && response.key && response.state) {
+ QDLogger.log( "ActivecallAssistant#onSliderEvent", response.key , response.state);
+ Mojo.Log.info( "ActivecallAssistant#onSliderEvent", response.key , response.state);
+ } else {
+ return;
+ }
+ if (response.key == "slider") {
+ QDLogger.log( "log: ", this.sliderPos, response.state);
+ Mojo.Log.info( "log: ", this.sliderPos, response.state);
+ if (this.sliderPos=='up'&&response.state == "down") {
+ QDLogger.log( "**********UP DOWN************");
+ Mojo.Log.info( "**********UP DOWN************");
+ //First, "tap" each Disconnect Button.
+ for (i = 0; i < 3; i++) {
+ if (this.controller.get("disc_button_" + i)) {
+ QDLogger.log( "**** disconnecting line:" + i + "****");
+ Mojo.Log.info( "**** disconnecting line:" + i + "****");
+ Mojo.Event.send(this.controller.get("disc_button_" + i), Mojo.Event.tap);
+ }
+ }
+ QDLogger.log( "******** end loop **********");
+ Mojo.Log.info( "******** end loop **********");
+ //In case the Disconnect Buttons don't work, or there are calls not disconnected, just call the function to disconnect all calls.
+ //The reason we don't just do this one function is that the screen redraw is not pretty.
+ QDLogger.log( "********disconnecting all calls********");
+ Mojo.Log.info( "********disconnecting all calls********");
+ this.eventListener.disconnectAllCalls();
+ QDLogger.log( "********finished routine********");
+ Mojo.Log.info( "********finished routine********");
+ }
+ this.sliderPos = response.state;
+ }
+ },
+//END Slider Patch block 2 of 3
+
handleCommand: function(event) {
if (event.type == Mojo.Event.command) {
switch (event.command) {
@@ -1230,6 +1280,10 @@ break;
+//END Slider Patch block 2 of 3
+
setup: function(){
this.stageController = this.controller.stageController;

@@ -1478,6 +1528,11 @@ break;
this.controller.document.removeEventListener('keydown', this.boundStartDTMFHardKey);
this.controller.document.removeEventListener('keyup', this.boundEndDTMFHardKey);

+
+//BEGIN Slider Patch block 3 of 3
+ this.sliderSubscriptionx.cancel(); //remove slider listener
+//END Slider Patch block 3 of 3
+
// drop puck subscription
this.puckSubscription.cancel();
delete this.puckSubscription;

0 comments on commit 48604e5

Please sign in to comment.