diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-11-02 10:13:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-02 10:13:17 -0700 |
| commit | 7f0c850b7a4a2b8a135a110a33d053f4d6689559 (patch) | |
| tree | b6f34e9af381cc68b926e6de279161a69fd18b5c /core/res/res/layout-sw600dp | |
| parent | f9d8faf7fe9d23bddf4d8d039805bce806e9b9c6 (diff) | |
| parent | ec1e06a00d26a783fb948e739ad8157c03e55302 (diff) | |
| download | frameworks_base-7f0c850b7a4a2b8a135a110a33d053f4d6689559.zip frameworks_base-7f0c850b7a4a2b8a135a110a33d053f4d6689559.tar.gz frameworks_base-7f0c850b7a4a2b8a135a110a33d053f4d6689559.tar.bz2 | |
Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
Diffstat (limited to 'core/res/res/layout-sw600dp')
| -rw-r--r-- | core/res/res/layout-sw600dp/date_picker_dialog.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout-sw600dp/number_picker.xml | 39 |
2 files changed, 2 insertions, 39 deletions
diff --git a/core/res/res/layout-sw600dp/date_picker_dialog.xml b/core/res/res/layout-sw600dp/date_picker_dialog.xml index 004d52a..f9b247f 100644 --- a/core/res/res/layout-sw600dp/date_picker_dialog.xml +++ b/core/res/res/layout-sw600dp/date_picker_dialog.xml @@ -22,4 +22,6 @@ android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:spinnersShown="true" + android:calendarViewShown="true" /> diff --git a/core/res/res/layout-sw600dp/number_picker.xml b/core/res/res/layout-sw600dp/number_picker.xml deleted file mode 100644 index 807daf2..0000000 --- a/core/res/res/layout-sw600dp/number_picker.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2008, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - - <ImageButton android:id="@+id/increment" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - style="?android:attr/numberPickerUpButtonStyle" - android:contentDescription="@string/number_picker_increment_button" /> - - <EditText android:id="@+id/numberpicker_input" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - style="?android:attr/numberPickerInputTextStyle" /> - - <ImageButton android:id="@+id/decrement" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - style="?android:attr/numberPickerDownButtonStyle" - android:contentDescription="@string/number_picker_decrement_button" /> - -</merge> |