OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4fea5f
)
Formatting fix
author
Steven Ross
<stross@google.com>
Mon, 3 Oct 2011 10:50:47 +0000
(06:50 -0400)
committer
Steven Ross
<stross@google.com>
Mon, 3 Oct 2011 10:50:47 +0000
(06:50 -0400)
Change-Id: If2869f2d6d6bc788cfffc1187b4de1deb9cec83b
src/com/android/settings/ChooseLockGeneric.java
patch
|
blob
|
history
diff --git
a/src/com/android/settings/ChooseLockGeneric.java
b/src/com/android/settings/ChooseLockGeneric.java
index
9301a86
..
47ecfc4
100644
(file)
--- a/
src/com/android/settings/ChooseLockGeneric.java
+++ b/
src/com/android/settings/ChooseLockGeneric.java
@@
-330,8
+330,7
@@
public class ChooseLockGeneric extends PreferenceActivity {
if(isFallback) {
startActivityForResult(intent, FALLBACK_REQUEST);
return;
- }
- else {
+ } else {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(intent);
}
@@
-348,8
+347,7
@@
public class ChooseLockGeneric extends PreferenceActivity {
if(isFallback) {
startActivityForResult(intent, FALLBACK_REQUEST);
return;
- }
- else {
+ } else {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(intent);
}