diff options
| -rw-r--r-- | res/xml/default_workspace.xml | 22 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java | 12 |
2 files changed, 13 insertions, 21 deletions
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index 4c50d8481..8da71f12d 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -18,14 +18,6 @@ <!-- Far-left screen [0] --> <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="3" - launcher:spanX="4" - launcher:spanY="1" /> <!-- Middle screen [2] --> <appwidget @@ -42,21 +34,15 @@ launcher:screen="2" launcher:x="0" launcher:y="3" /> - - <!-- Right screen [3] --> <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" - launcher:y="3" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="2" + launcher:screen="2" + launcher:x="3" launcher:y="3" /> + <!-- Right screen [3] --> + <!-- Far-right screen [4] --> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> diff --git a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java index bc858fdcb..4bf73a41b 100644 --- a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java +++ b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java @@ -99,6 +99,10 @@ public class NumberPickerPreference extends DialogPreference { mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker); + if (mNumberPicker == null) { + throw new RuntimeException("NumberPicker is null!"); + } + // Initialize state mNumberPicker.setMaxValue(max); mNumberPicker.setMinValue(min); @@ -107,9 +111,11 @@ public class NumberPickerPreference extends DialogPreference { // No keyboard popup EditText textInput = (EditText) mNumberPicker.findViewById(com.android.internal.R.id.numberpicker_input); - textInput.setCursorVisible(false); - textInput.setFocusable(false); - textInput.setFocusableInTouchMode(false); + if (textInput != null) { + textInput.setCursorVisible(false); + textInput.setFocusable(false); + textInput.setFocusableInTouchMode(false); + } return view; } |