TimePicker CTS test failing.

TimePicker code for setting the IME options was not taking into
account the old style of the UI where the AmPm spinner can be
null.

bug:5318844

Change-Id: I58b1781ef95398d11ecf0ca5bb49817cbba97b54

1 files changed, 8 insertions, 6 deletions

diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java
index 7865d5008f04..7444d46178a6 100644
--- a/core/java/android/widget/TimePicker.java
+++ b/core/java/android/widget/TimePicker.java
@@ -218,9 +218,9 @@ public class TimePicker extends FrameLayout {
                     updateAmPmControl();
                 }
             });
+            EditText amPmInput = (EditText) mAmPmSpinner.findViewById(R.id.numberpicker_input);
+            amPmInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
         }
-        EditText amPmInput = (EditText) mAmPmSpinner.findViewById(R.id.numberpicker_input);
-        amPmInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
         // update controls to initial state
         updateHourControl();
@@ -519,9 +519,11 @@ public class TimePicker extends FrameLayout {
         text = mContext.getString(R.string.time_picker_decrement_hour_button);
         mHourSpinner.findViewById(R.id.decrement).setContentDescription(text);
         // AM/PM
-        text = mContext.getString(R.string.time_picker_increment_set_pm_button);
-        mAmPmSpinner.findViewById(R.id.increment).setContentDescription(text);
-        text = mContext.getString(R.string.time_picker_decrement_set_am_button);
-        mAmPmSpinner.findViewById(R.id.decrement).setContentDescription(text);
+        if (mAmPmSpinner != null) {
+            text = mContext.getString(R.string.time_picker_increment_set_pm_button);
+            mAmPmSpinner.findViewById(R.id.increment).setContentDescription(text);
+            text = mContext.getString(R.string.time_picker_decrement_set_am_button);
+            mAmPmSpinner.findViewById(R.id.decrement).setContentDescription(text);
+        }
     }
 }