summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-01-16 12:01:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-16 12:01:03 -0800
commitf6bbf11a05b03201229fbc6ebe5a241692f212f2 (patch)
treee35b278be0defb4e2c40342cfc17b8f1f2af8538 /src
parent267d51a68a6e2bc40b90d199425af88a7a824f53 (diff)
parentffe621f03f2ce14883ada77e4f4a76c529275495 (diff)
downloadpackages_apps_Settings-f6bbf11a05b03201229fbc6ebe5a241692f212f2.zip
packages_apps_Settings-f6bbf11a05b03201229fbc6ebe5a241692f212f2.tar.gz
packages_apps_Settings-f6bbf11a05b03201229fbc6ebe5a241692f212f2.tar.bz2
Merge "Revise layout for DateTime setup" into honeycomb
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/DateTimeSettingsSetupWizard.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 7fd7ef7..6964175 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -49,7 +49,7 @@ public class DateTimeSettingsSetupWizard extends Activity
// force the first status of auto datetime flag.
private static final String EXTRA_INITIAL_AUTO_DATETIME_VALUE =
- "extra_initial_auto_datetime_value";
+ "extra_initial_auto_datetime_value";
private boolean mXLargeScreenSize;
@@ -126,7 +126,10 @@ public class DateTimeSettingsSetupWizard extends Activity
mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
((Button)findViewById(R.id.next_button)).setOnClickListener(this);
- ((Button)findViewById(R.id.skip_button)).setOnClickListener(this);
+ final Button skipButton = (Button)findViewById(R.id.skip_button);
+ if (skipButton != null) {
+ skipButton.setOnClickListener(this);
+ }
}
@Override