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

Commit 750b9acd authored by Scott Hancher's avatar Scott Hancher Committed by Josh Guilfoyle
Browse files

Fix remainder of header and list item themes to conform to redlines.

parent 903cc1b8

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ 
		<attr name="textAppearanceLabelListItemText" format="reference" />

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



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

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

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

		<attr name="headerLayoutSubHeader" format="reference" />
@@ -401,6 +402,7 @@ 
		<attr name="headerLayoutSecondaryLargeIcon" format="reference" />

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

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

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

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

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

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

core/res/res/values/styles.xml

+16 −6
Original line number Diff line number Diff line
@@ -682,10 +682,10 @@ 
    </style>



	<style name="Widget.HeaderLayout" >

		<item name="android:background">@color/black</item>

		<item name="android:background">?android:attr/headerLayoutBackground</item>

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

		<item name="android:paddingLeft">10dp</item>

		<item name="android:paddingRight">10dp</item>

		<item name="android:paddingLeft">8dp</item>

		<item name="android:paddingRight">8dp</item>

		<item name="android:paddingTop">0dp</item>

		<item name="android:paddingBottom">0dp</item>

	</style>
@@ -727,6 +727,7 @@ 
	</style>

	

    <style name="Widget.HeaderLayout.SectionHeaderLabel">

		<item name="android:background">?android:attr/sectionHeaderLayoutBackground</item>

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

        <item name="android:minHeight">40dp</item>

        <item name="android:gravity">left|center_vertical</item>
@@ -781,8 +782,8 @@ 
    </style>

	

	<style name="Widget.ListItemLayout" >

        <item name="android:paddingLeft">10dp</item>

        <item name="android:paddingRight">10dp</item>

        <item name="android:paddingLeft">8dp</item>

        <item name="android:paddingRight">8dp</item>

        <item name="android:paddingTop">0dp</item>

        <item name="android:paddingBottom">0dp</item>

    </style>
@@ -817,17 +818,26 @@ 
    

	<style name="TextAppearance.Label">

        <item name="android:singleLine">true</item>

		<item name="android:includeFontPadding">false</item>

	</style>

	<style name="TextAppearance.Label.Header">

        <item name="android:textColor">?textColorPrimaryInverse</item>

        <item name="android:textStyle">bold</item>

	</style>

	<style name="TextAppearance.Label.SubHeader">

        <item name="android:textColor">?textColorPrimaryInverse</item>

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

	</style>

    <style name="TextAppearance.Label.ListItem">

        <item name="android:textStyle">bold</item>

    </style>

    <style name="TextAppearance.Label.ListItemText">

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

    </style>

    <style name="TextAppearance.Label.ListItemSecondaryText">

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

    </style>

    

	<style name="HeaderTextIcon">

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

		<item name="android:paddingRight">10dp</item>

core/res/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
		<item name="textAppearanceLabelListItemText">@android:style/TextAppearance.Label.ListItemText</item>

		<item name="textAppearanceLabelListItemSecondaryText">@android:style/TextAppearance.Label.ListItemSecondaryText</item>



		<item name="headerLayoutBackground">@color/black</item>

		<item name="headerLayout">@android:style/Widget.HeaderLayout</item>

		<item name="headerLayoutLabel">@android:style/Widget.HeaderLayout.HeaderLabel</item>

		<item name="headerLayoutSubHeader">@android:style/Widget.HeaderLayout.HeaderSubHeader</item>
@@ -189,6 +190,7 @@ 
		<item name="headerLayoutSecondaryLargeIcon">@android:style/Widget.HeaderLayout.HeaderSecondaryLargeIcon</item>

		<item name="headerLayoutPersonalPanel">@android:style/Widget.HeaderLayout.HeaderPersonalPanel</item>

        <item name="headerLayoutProductPanel">@android:style/Widget.HeaderLayout.HeaderProductPanel</item>

		<item name="sectionHeaderLayoutBackground">@color/black</item>

        <item name="sectionHeaderLayoutLabel">@android:style/Widget.HeaderLayout.SectionHeaderLabel</item>

        <item name="listItemLayout">@android:style/Widget.ListItemLayout.ItemLabelText</item>

        <item name="listItemLayoutItemLabelTwinText">@android:style/Widget.ListItemLayout.ItemLabelTwinText</item>