Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177d6bf5 authored by Filip Gruszczyński's avatar Filip Gruszczyński Committed by Android Git Automerger
Browse files

am cad87695: am fad83743: Merge "NumberPicker style for wearable devices." into klp-modular-dev 

* commit 'cad87695':
  NumberPicker style for wearable devices.
parents bd443abc cad87695

core/res/res/layout/number_picker_with_selector_wheel_micro.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?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>

core/res/res/values/styles_micro.xml

+11 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/themes_micro.xml

+12 −2
Original line number Diff line number Diff line
@@ -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>