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

Commit b64d5e76 authored by cretin45's avatar cretin45
Browse files

SetupWizard: Fix locale picker styling 

Change-Id: If336a8321b09513ec8b22f8138a47fb4d94e5913
parent 41801b0c

res/layout/locale_picker.xml

+19 −17
Original line number Original line Diff line number Diff line
@@ -19,21 +19,23 @@ 




<merge xmlns:android="http://schemas.android.com/apk/res/android">

<merge xmlns:android="http://schemas.android.com/apk/res/android">





    <ImageButton android:id="@+id/increment"

    <ImageButton android:id="@+id/lp__increment"

                 android:layout_width="fill_parent"

                 android:layout_width="fill_parent"

                 android:layout_height="wrap_content"

                 android:layout_height="wrap_content"

                 android:paddingTop="22dip"

                 android:paddingTop="22dip"

                 android:paddingBottom="22dip"/>

                 android:paddingBottom="22dip"/>





    <EditText

    <view class="com.cyanogenmod.setupwizard.ui.LocalePicker$CustomEditText"

        android:id="@+id/numberpicker_input"

          android:textAppearance="?android:attr/textAppearanceMedium"

          android:textColor="?android:attr/textColorPrimary"

          android:id="@+id/localepicker_input"

          android:layout_width="fill_parent"

          android:layout_width="fill_parent"

          android:layout_height="wrap_content"

          android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceMediumInverse"

          android:gravity="center"

          android:gravity="center"

        android:singleLine="true" />

          android:singleLine="true"

          android:background="@null" />





    <ImageButton android:id="@+id/decrement"

    <ImageButton android:id="@+id/lp__decrement"

                 android:layout_width="fill_parent"

                 android:layout_width="fill_parent"

                 android:layout_height="wrap_content"

                 android:layout_height="wrap_content"

                 android:paddingTop="22dip"

                 android:paddingTop="22dip"

res/layout/setup_welcome_page.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ 
            android:id="@+id/locale_list"

            android:id="@+id/locale_list"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/min_locale_picker_height"

            android:focusable="true"

            android:focusable="true"

            android:focusableInTouchMode="true"

            android:focusableInTouchMode="true"

            android:layout_centerInParent="true"/>

            android:layout_centerInParent="true"/>

res/values/attrs.xml

+15 −0
Original line number Original line Diff line number Diff line
@@ -17,4 +17,19 @@ 
    <declare-styleable name="ScrimInsetsView">

    <declare-styleable name="ScrimInsetsView">

        <attr name="insetForeground" format="reference|color" />

        <attr name="insetForeground" format="reference|color" />

    </declare-styleable>

    </declare-styleable>



    <attr name="localePickerStyle" format="reference" />



    <declare-styleable name="LocalePicker">

        <attr name="solidColor" format="color|reference" />

        <attr name="selectionDivider" format="reference" />

        <attr name="selectionDividerHeight" format="dimension" />

        <attr name="selectionDividersDistance" format="dimension" />

        <attr name="internalMinHeight" format="dimension" />

        <attr name="internalMaxHeight" format="dimension" />

        <attr name="internalMinWidth" format="dimension" />

        <attr name="internalMaxWidth" format="dimension" />

        <attr name="internalLayout" format="reference" />

        <attr name="virtualButtonPressedDrawable" format="reference"/>

    </declare-styleable>

</resources>
 
</resources>

res/values/ids.xml

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <item name="localepicker_input" type="id" />

    <item name="lp__increment" type="id" />

    <item name="lp__decrement" type="id" />



</resources>

res/values/styles.xml

+21 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
        <item name="android:textColorLink">@color/accent</item>

        <item name="android:textColorLink">@color/accent</item>

        <item name="android:statusBarColor">@android:color/transparent</item>

        <item name="android:statusBarColor">@android:color/transparent</item>

        <item name="android:windowAnimationStyle">@style/ActivityAnimations</item>

        <item name="android:windowAnimationStyle">@style/ActivityAnimations</item>

        <item name="localePickerStyle">@style/LocaleWidget.Material.LocalePicker</item>

    </style>

    </style>





    <style name="ActivityAnimations" parent="@android:style/Animation.Activity">

    <style name="ActivityAnimations" parent="@android:style/Animation.Activity">
@@ -97,4 +98,24 @@ 
        <item name="android:gravity">center_vertical|end</item>

        <item name="android:gravity">center_vertical|end</item>

        <item name="android:drawableRight">@drawable/ic_chevron_right_dark</item>

        <item name="android:drawableRight">@drawable/ic_chevron_right_dark</item>

    </style>

    </style>



    <style name="LocaleWidget">

        <item name="android:textAppearance">?android:attr/textAppearance</item>

    </style>



    <style name="LocaleWidget.LocalePicker">

        <item name="android:orientation">vertical</item>

        <item name="android:fadingEdge">vertical</item>

        <item name="android:fadingEdgeLength">50dip</item>

    </style>



    <style name="LocaleWidget.Material.LocalePicker" parent="LocaleWidget.LocalePicker">

        <item name="solidColor">@android:color/transparent</item>

        <item name="selectionDivider">@drawable/divider</item>

        <item name="selectionDividerHeight">1dip</item>

        <item name="internalLayout">@layout/locale_picker</item>

        <item name="internalMinWidth">64dip</item>

        <item name="internalMaxHeight">180dip</item>

        <item name="virtualButtonPressedDrawable">@null</item>

    </style>

</resources>
 
</resources>