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

Commit dfe0bc6c authored by Ed Carrigan's avatar Ed Carrigan Committed by Josh Guilfoyle
Browse files

Changes to make the NumberPicker widget styleable. 

CR: Josh Guilfoyle
parent ba5d29e1

core/res/res/layout/number_picker.xml

+4 −7
Original line number Original line Diff line number Diff line
@@ -22,21 +22,18 @@ 
    <com.android.internal.widget.NumberPickerButton android:id="@+id/increment"

    <com.android.internal.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" />

        style="?android:attr/buttonStyleTimePickerUp" />





    <EditText android:id="@+id/timepicker_input"

    <EditText android:id="@+id/timepicker_input"

        android:layout_width="fill_parent"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:singleLine="true"

        android:singleLine="true"

        style="?android:attr/textAppearanceLargeInverse"

        style="?android:attr/timePickerInputStyle"

        android:textColor="@android:color/primary_text_light"

    />

        android:textSize="30sp"

        android:background="@drawable/timepicker_input" />





    <com.android.internal.widget.NumberPickerButton android:id="@+id/decrement"

    <com.android.internal.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" />

        style="?android:attr/buttonStyleTimePickerDown" />





</merge>
 
</merge>

core/res/res/values/attrs.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -144,6 +144,10 @@ 
        <!-- ToggleButton style. -->

        <!-- ToggleButton style. -->

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

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

        

        

        <!-- TimePicker Button styles. -->

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

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



        <!-- ============== -->

        <!-- ============== -->

        <!-- Tab styles -->

        <!-- Tab styles -->

        <!-- ============== -->

        <!-- ============== -->
@@ -345,6 +349,8 @@ 
        <attr name="dropDownListViewStyle" format="reference" />

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

        <!-- Default EditText style. -->

        <!-- Default EditText style. -->

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

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

        <!-- Default TimePicker Input style. -->

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

        <!-- Default ExpandableListView style. -->

        <!-- Default ExpandableListView style. -->

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

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

        <!-- Default Gallery style. -->

        <!-- Default Gallery style. -->

core/res/res/values/public.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -1077,6 +1077,8 @@ 
  <public type="style" name="LauncherWorkspaceIcon.Portrait" id="0x0103005d" />

  <public type="style" name="LauncherWorkspaceIcon.Portrait" id="0x0103005d" />

  <public type="style" name="LauncherWorkspaceIcon.Landscape" id="0x0103005e" />

  <public type="style" name="LauncherWorkspaceIcon.Landscape" id="0x0103005e" />

  

  

  <public type="style" name="Widget.EditText.TimePicker" id="0x0103005f" />

  

  <public type="string" name="dialog_alert_title" id="0x01040014" />

  <public type="string" name="dialog_alert_title" id="0x01040014" />

  <public type="string" name="VideoView_error_text_invalid_progressive_playback" id="0x01040015" />

  <public type="string" name="VideoView_error_text_invalid_progressive_playback" id="0x01040015" />
@@ -1120,6 +1122,9 @@ 
  <public type="attr" name="liveFolderListStyle" id="0x0101029b" />

  <public type="attr" name="liveFolderListStyle" id="0x0101029b" />

  <public type="attr" name="liveFolderButtonStyle" id="0x0101029c" />

  <public type="attr" name="liveFolderButtonStyle" id="0x0101029c" />

  <public type="attr" name="deleteZoneStyle" id="0x0101029d" />

  <public type="attr" name="deleteZoneStyle" id="0x0101029d" />

  <public type="attr" name="timePickerInputStyle" id="0x0101029e" />

  <public type="attr" name="buttonStyleTimePickerUp" id="0x0101029f" />

  <public type="attr" name="buttonStyleTimePickerDown" id="0x010102a0" />





  <public type="integer" name="config_shortAnimTime" id="0x010e0000" />

  <public type="integer" name="config_shortAnimTime" id="0x010e0000" />

  <public type="integer" name="config_mediumAnimTime" id="0x010e0001" />

  <public type="integer" name="config_mediumAnimTime" id="0x010e0001" />

core/res/res/values/styles.xml

+15 −0
Original line number Original line Diff line number Diff line
@@ -332,6 +332,13 @@ 
        <item name="android:gravity">center_vertical</item>

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

    </style>

    </style>

    

    

    <style name="Widget.EditText.TimePicker">

        <item name="android:background">@android:drawable/timepicker_input</item>

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

        <item name="android:gravity">center</item>

        <item name="android:textSize">30sp</item>

    </style>

    

    <style name="Widget.ExpandableListView" parent="Widget.ListView">

    <style name="Widget.ExpandableListView" parent="Widget.ListView">

        <item name="android:groupIndicator">@android:drawable/expander_group</item>

        <item name="android:groupIndicator">@android:drawable/expander_group</item>

        <item name="android:indicatorLeft">?android:attr/expandableListPreferredItemIndicatorLeft</item>

        <item name="android:indicatorLeft">?android:attr/expandableListPreferredItemIndicatorLeft</item>
@@ -699,6 +706,14 @@ 
        <item name="android:background">@android:drawable/bottom_bar</item>

        <item name="android:background">@android:drawable/bottom_bar</item>

    </style>

    </style>

    

    

    <style name="TimePickerUpButton">

        <item name="android:background">@android:drawable/timepicker_up_btn</item>

    </style>

    

     <style name="TimePickerDownButton">

        <item name="android:background">@android:drawable/timepicker_down_btn</item>

    </style>

    

    <!-- Launcher Default Styles -->

    <!-- Launcher Default Styles -->

    <eat-comment />

    <eat-comment />

core/res/res/values/themes.xml

+9 −1
Original line number Original line Diff line number Diff line
@@ -73,6 +73,9 @@ 




        <item name="buttonStyleToggle">@android:style/Widget.Button.Toggle</item>

        <item name="buttonStyleToggle">@android:style/Widget.Button.Toggle</item>

        

        

        <item name="buttonStyleTimePickerUp">@android:style/TimePickerUpButton</item>

        <item name="buttonStyleTimePickerDown">@android:style/TimePickerDownButton</item>

        

        <!-- List attributes -->

        <!-- List attributes -->

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

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

        <item name="listDivider">@drawable/divider_horizontal_dark</item>

        <item name="listDivider">@drawable/divider_horizontal_dark</item>
@@ -134,6 +137,7 @@ 
        <item name="checkboxStyle">@android:style/Widget.CompoundButton.CheckBox</item>

        <item name="checkboxStyle">@android:style/Widget.CompoundButton.CheckBox</item>

        <item name="dropDownListViewStyle">@android:style/Widget.ListView.DropDown</item>

        <item name="dropDownListViewStyle">@android:style/Widget.ListView.DropDown</item>

        <item name="editTextStyle">@android:style/Widget.EditText</item>

        <item name="editTextStyle">@android:style/Widget.EditText</item>

        <item name="timePickerInputStyle">@android:style/Widget.EditText.TimePicker</item>

        <item name="expandableListViewStyle">@android:style/Widget.ExpandableListView</item>

        <item name="expandableListViewStyle">@android:style/Widget.ExpandableListView</item>

        <item name="galleryStyle">@android:style/Widget.Gallery</item>

        <item name="galleryStyle">@android:style/Widget.Gallery</item>

        <item name="gridViewStyle">@android:style/Widget.GridView</item>        

        <item name="gridViewStyle">@android:style/Widget.GridView</item>
@@ -338,6 +342,10 @@ 
        <item name="listItemTextViewStyle">@android:style/Widget.TextView.ListItem.White</item>

        <item name="listItemTextViewStyle">@android:style/Widget.TextView.ListItem.White</item>

        <item name="colorBackground">@android:color/white</item>

        <item name="colorBackground">@android:color/white</item>

        <item name="cacheColorHint">@android:color/white</item>

        <item name="cacheColorHint">@android:color/white</item>

        

        <item name="android:timePickerInputStyle">@android:style/Widget.EditText.TimePicker</item>

        <item name="android:buttonStyleTimePickerUp">@android:style/TimePickerUpButton</item>

        <item name="android:buttonStyleTimePickerDown">@android:style/TimePickerDownButton</item>

    </style>

    </style>

    

    

    <!-- Default dark theme for panel windows.  This removes all extraneous

    <!-- Default dark theme for panel windows.  This removes all extraneous