drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 16396414: Merge change If5b0b6fa into eclair-mr2

Browse Source 
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp

* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
  Fixed class paths in layout xml files
This commit is contained in:
Paul Westbrook
2009-12-14 15:29:46 -08:00
committed by Android Git Automerger
parent dc7294d94d 163964143f
commit b6ffc8f253
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/layout/date_picker.xml
View File

@ -29,7 +29,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- Month --> <!-- Month -->
<com.android.internal.widget.NumberPicker <com.android.common.widget.NumberPicker
android:id="@+id/month" android:id="@+id/month"
android:layout_width="80dip" android:layout_width="80dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -40,7 +40,7 @@
/> />
<!-- Day --> <!-- Day -->
<com.android.internal.widget.NumberPicker <com.android.common.widget.NumberPicker
android:id="@+id/day" android:id="@+id/day"
android:layout_width="80dip" android:layout_width="80dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -51,7 +51,7 @@
/> />
<!-- Year --> <!-- Year -->
<com.android.internal.widget.NumberPicker <com.android.common.widget.NumberPicker
android:id="@+id/year" android:id="@+id/year"
android:layout_width="95dip" android:layout_width="95dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
core/res/res/layout/number_picker.xml
View File

@ -19,7 +19,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">
<com.android.internal.widget.NumberPickerButton android:id="@+id/increment" <com.android.common.widget.NumberPickerButton android:id="@+id/increment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timepicker_up_btn" /> android:background="@drawable/timepicker_up_btn" />
@ -34,7 +34,7 @@
android:textSize="30sp" android:textSize="30sp"
android:background="@drawable/timepicker_input" /> android:background="@drawable/timepicker_input" />
<com.android.internal.widget.NumberPickerButton android:id="@+id/decrement" <com.android.common.widget.NumberPickerButton android:id="@+id/decrement"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timepicker_down_btn" /> android:background="@drawable/timepicker_down_btn" />

4
core/res/res/layout/time_picker.xml
View File

@ -26,7 +26,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- hour --> <!-- hour -->
<com.android.internal.widget.NumberPicker <com.android.common.widget.NumberPicker
android:id="@+id/hour" android:id="@+id/hour"
android:layout_width="70dip" android:layout_width="70dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -35,7 +35,7 @@
/> />
<!-- minute --> <!-- minute -->
<com.android.internal.widget.NumberPicker <com.android.common.widget.NumberPicker
android:id="@+id/minute" android:id="@+id/minute"
android:layout_width="70dip" android:layout_width="70dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"