Merge "charger: allow home button to wake" into jellybean

hyperb1iss · Gerrit Code Review · commit d8aa8ab7424b · 2012-11-06T00:29:27.000-08:00
diff --git a/charger/charger.c b/charger/charger.c
@@ -870,6 +870,9 @@ static void process_key(struct charger *charger, int code, int64_t now)
             if (key->pending)
                 kick_animation(charger->batt_anim);
         }
+    } else {
+        if (key->pending)
+            kick_animation(charger->batt_anim);
     }
 
     key->pending = false;
@@ -878,6 +881,7 @@ static void process_key(struct charger *charger, int code, int64_t now)
 static void handle_input_state(struct charger *charger, int64_t now)
 {
     process_key(charger, KEY_POWER, now);
+    process_key(charger, KEY_HOME, now);
 
     if (charger->next_key_check != -1 && now > charger->next_key_check)
         charger->next_key_check = -1;

Original file line number	Diff line number	Diff line change
`@@ -870,6 +870,9 @@ static void process_key(struct charger *charger, int code, int64_t now)`
`870`	`870`	`if (key->pending)`
`871`	`871`	`kick_animation(charger->batt_anim);`
`872`	`872`	`}`
	`873`	`+ } else {`
	`874`	`+ if (key->pending)`
	`875`	`+ kick_animation(charger->batt_anim);`
`873`	`876`	`}`
`874`	`877`
`875`	`878`	`key->pending = false;`
`@@ -878,6 +881,7 @@ static void process_key(struct charger *charger, int code, int64_t now)`
`878`	`881`	`static void handle_input_state(struct charger *charger, int64_t now)`
`879`	`882`	`{`
`880`	`883`	`process_key(charger, KEY_POWER, now);`
	`884`	`+ process_key(charger, KEY_HOME, now);`
`881`	`885`
`882`	`886`	`if (charger->next_key_check != -1 && now > charger->next_key_check)`
`883`	`887`	`charger->next_key_check = -1;`