From 53b948d3aec62e886bd10da664a07bdaab916b48 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Fri, 2 Mar 2012 14:03:35 -0800
Subject: Sync of the TimePicker attributes with the public Java APIs.

1. Renamed an attribute which is not mean to be public so
   its name is not the same as that of an already public one.

bug:6094713

Change-Id: I3f8b3f3840b88265069d3474be7db04056d219c1
---
 core/java/android/widget/TimePicker.java | 2 +-
 core/res/res/values/attrs.xml            | 4 ++--
 core/res/res/values/styles.xml           | 4 ++--
 3 files changed, 5 insertions(+), 5 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(
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index e81cba94fd5d..24349743676c 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3392,7 +3392,7 @@
         <attr name="minDate" format="string" />
         <!-- The minimal date shown by this calendar view in mm/dd/yyyy format. -->
         <attr name="maxDate" format="string" />
-        <!-- @hide The layout of the time picker. -->
+        <!-- @hide The layout of the date picker. -->
         <attr name="internalLayout" format="reference"  />
     </declare-styleable>
 
@@ -3636,7 +3636,7 @@
 
     <declare-styleable name="TimePicker">
         <!-- @hide The layout of the time picker. -->
-        <attr name="layout" />
+        <attr name="internalLayout" />
     </declare-styleable>
 
     <!-- ========================= -->
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index ba29afc4bd4d..a9975cc60eb9 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -528,7 +528,7 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="Widget.TimePicker">
-        <item name="android:layout">@android:layout/time_picker</item>
+        <item name="android:internalLayout">@android:layout/time_picker</item>
     </style>
 
     <style name="Widget.DatePicker">
@@ -1661,7 +1661,7 @@ please see styles_device_defaults.xml.
     </style>
 
     <style name="Widget.Holo.TimePicker" parent="Widget.TimePicker">
-        <item name="android:layout">@android:layout/time_picker_holo</item>
+        <item name="android:internalLayout">@android:layout/time_picker_holo</item>
     </style>
 
     <style name="Widget.Holo.DatePicker" parent="Widget.DatePicker">
-- 
cgit v1.2.3-59-g8ed1b