diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-03-02 15:33:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-02 15:33:20 -0800 |
| commit | 72d403ce351e91551324f2c935ea70b487da223c (patch) | |
| tree | e82971b1387c1fbb94532de2734947bb17178814 /core/java/android | |
| parent | 3ee7ce2be31431a940c635f5c2ca52ebbddb94ed (diff) | |
| parent | 53b948d3aec62e886bd10da664a07bdaab916b48 (diff) | |
Merge "Sync of the TimePicker attributes with the public Java APIs."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/TimePicker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java index ef1d7d01bf36..7eff1aa04bd2 100644 --- a/core/java/android/widget/TimePicker.java +++ b/core/java/android/widget/TimePicker.java @@ -136,7 +136,7 @@ public class TimePicker extends FrameLayout { TypedArray attributesArray = context.obtainStyledAttributes( attrs, R.styleable.TimePicker, defStyle, 0); int layoutResourceId = attributesArray.getResourceId( - R.styleable.TimePicker_layout, R.layout.time_picker); + R.styleable.TimePicker_internalLayout, R.layout.time_picker); attributesArray.recycle(); LayoutInflater inflater = (LayoutInflater) context.getSystemService( |