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

Commit f8735710 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Allow theming via Theme Chooser: add missing values for landscape and tablets" into cm-10.1

parents ca0259c6 7e6c16f4

res/layout-land/contact_detail_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
        android:layout_above="@id/contact_quick_fix"

        android:layout_height="match_parent"

        android:baselineAligned="false"

        android:background="@android:color/white">

        android:background="@color/background_primary">



        <include android:id="@+id/static_photo_container"

            layout="@layout/photo_selector_view"

res/values-sw580dp-land/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<resources>

    <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">

    <style name="PeopleTheme1" parent="@android:style/Theme.Holo.Light.DarkActionBar">

        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>

        <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
@@ -23,6 +23,8 @@ 
        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

    </style>

    <style name="PeopleTheme" parent="@style/PeopleTheme1">

        <item name="list_item_height">?android:attr/listPreferredItemHeight</item>

        <item name="activated_background">@drawable/list_item_activated_background</item>

        <item name="section_header_background">@drawable/list_title_holo</item>

res/values-sw580dp/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<resources>

    <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">

    <style name="PeopleTheme1" parent="@android:style/Theme.Holo.Light.DarkActionBar">

        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>

        <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
@@ -23,6 +23,8 @@ 
        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

    </style>

    <style name="PeopleTheme" parent="@style/PeopleTheme1">

        <item name="list_item_height">?android:attr/listPreferredItemHeight</item>

        <item name="activated_background">@drawable/list_item_activated_background</item>

        <item name="section_header_background">@drawable/list_title_holo</item>

res/values-sw680dp/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<resources>

    <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">

    <style name="PeopleTheme1" parent="@android:style/Theme.Holo.Light.DarkActionBar">

        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>

        <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
@@ -23,6 +23,8 @@ 
        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

    </style>

    <style name="PeopleTheme" parent="@style/PeopleTheme1">

        <item name="list_item_height">?android:attr/listPreferredItemHeight</item>

        <item name="activated_background">@drawable/list_item_activated_background</item>

        <item name="section_header_background">@drawable/list_title_holo</item>