Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NumberPicker style for wearable devices." into klp-modular-dev

Browse Source
This commit is contained in:
Filip Gruszczyński
2014-03-04 01:56:37 +00:00
committed by Android (Google) Code Review
parent 13a14ac43b 66425bd855
commit fad8374373
3 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/res/res/layout/number_picker_with_selector_wheel_micro.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2012, 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">
<view class="android.widget.NumberPicker$CustomEditText"
android:textAppearance="?android:attr/textAppearanceLarge"
android:id="@+id/numberpicker_input"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:background="@null" />
</merge>

11
core/res/res/values/styles_micro.xml
View File

@@ -19,4 +19,15 @@
<style name="Widget.Micro.TextView">
<item name="android:fontFamily">sans-serif-condensed</item>
</style>
<style name="Widget.Micro.NumberPicker">
<item name="android:internalLayout">@android:layout/number_picker_with_selector_wheel_micro</item>
<item name="android:solidColor">@android:color/transparent</item>
<item name="android:selectionDivider">@android:drawable/numberpicker_selection_divider</item>
<item name="android:selectionDividerHeight">0dip</item>
<item name="android:selectionDividersDistance">0dip</item>
<item name="android:internalMinWidth">64dip</item>
<item name="android:internalMaxHeight">180dip</item>
<item name="virtualButtonPressedDrawable">?android:attr/selectableItemBackground</item>
</style>
</resources>

14
core/res/res/values/themes_micro.xml
View File

@@ -14,14 +14,24 @@
limitations under the License.
-->
<resources>
<style name="Theme.Micro" parent="Theme.Holo" />
<style name="Theme.Micro" parent="Theme.Holo">
<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
</style>
<style name="Theme.Micro.Light" parent="Theme.Holo.Light"/>
<style name="Theme.Micro.NoActionBar" parent="Theme.Holo.NoActionBar">
<item name="textViewStyle">@android:style/Widget.Micro.TextView</item>
<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
</style>
<style name="Theme.Micro.Light" parent="Theme.Holo.Light">
<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
</style>
<style name="Theme.Micro.Light.NoActionBar" parent="Theme.Holo.Light.NoActionBar">
<item name="textViewStyle">@android:style/Widget.Micro.TextView</item>
<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
</style>
<style name="Theme.Micro.Light.DarkActionBar" parent="Theme.Holo.Light.DarkActionBar">
<item name="textViewStyle">@android:style/Widget.Micro.TextView</item>
<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
</style>
</resources>