Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Bug 818354 - Disabling home button on locked screen while calling #6843

Merged
merged 1 commit into from over 1 year ago

2 participants

albertopq Etienne Segonzac
albertopq
Collaborator

No description provided.

apps/system/js/attention_screen.js
... ...
@@ -230,9 +230,9 @@ var AttentionScreen = {
230 230
   },
231 231
 
232 232
   // shrink the attention screen overlay to status bar
233  
-  // invoked when we get a "home" event
  233
+  // invoked when we get a "home" event (and the screen is not locked)
1
Etienne Segonzac Collaborator

the comment is misleading since the function is invoked when screen is locked too.
we should probably add a comment below.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
albertopq albertopq merged commit ce6d344 into from December 06, 2012
albertopq albertopq closed this December 06, 2012
Timothy Guan-tin Chien timdream referenced this pull request from a commit December 12, 2012
Timothy Guan-tin Chien Revert "Merge pull request #6843 from albertopq/dialer-818354"
This reverts commit ce6d344, reversing
changes made to 2b436ac.
54e3e49
Ismael González basiclines referenced this pull request from a commit in basiclines/gaia December 12, 2012
Timothy Guan-tin Chien Revert "Merge pull request #6843 from albertopq/dialer-818354"
This reverts commit ce6d344, reversing
changes made to 2b436ac.
bdae7cf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Dec 06, 2012
albertopq Bug 818354 - Disabling home button on locked screen while calling
Fixing comments
e1a82c5
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. 4  apps/system/js/attention_screen.js
4  apps/system/js/attention_screen.js
@@ -232,7 +232,9 @@ var AttentionScreen = {
232 232
   // shrink the attention screen overlay to status bar
233 233
   // invoked when we get a "home" event
234 234
   hide: function as_hide() {
235  
-    if (!this.isFullyVisible())
  235
+    // Doing nothing if the screen is already hiden
  236
+    // or in the lockscreen
  237
+    if (!this.isFullyVisible() || LockScreen.locked)
236 238
       return;
237 239
 
238 240
     this.dispatchEvent('status-active');
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.