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

Commit 6d6280c6 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge changes I31066a6f,I081cea0d into sc-dev 

* changes:
  Fix broken test
  Updates to conversation page
parents bd1c4e5f c94f997a

res/xml/conversation_list_settings.xml

+4 −16
Original line number Diff line number Diff line
@@ -29,18 +29,10 @@ 
    <PreferenceCategory

        android:key="important_conversations"

        android:title="@string/important_conversations"

        settings:isPreferenceVisible="false"

        settings:allowDividerAbove="false"

        settings:allowDividerBelow="true" >

        <Preference

            android:key="behavior"

            android:selectable="false"

            android:summary="@string/important_conversation_behavior_summary"/>

        settings:isPreferenceVisible="false" >

        <!-- Important conversations added here -->

        <PreferenceCategory

            android:key="important_conversations_list"

            settings:allowDividerAbove="false"

            settings:allowDividerBelow="false" >

            android:key="important_conversations_list" >

        </PreferenceCategory>

    </PreferenceCategory>
@@ -48,16 +40,12 @@ 
    <PreferenceCategory

        android:title="@string/other_conversations"

        android:key="other_conversations"

        settings:isPreferenceVisible="false"

        settings:allowDividerAbove="true"

        settings:allowDividerBelow="false" />

        settings:isPreferenceVisible="false" />



    <!-- Recent conversations added here -->

    <PreferenceCategory

        android:title="@string/recent_conversations"

        android:key="recent_conversations"

        settings:isPreferenceVisible="false"

        settings:allowDividerAbove="true"

        settings:allowDividerBelow="false" />

        settings:isPreferenceVisible="false"/>



</PreferenceScreen>

src/com/android/settings/notification/app/ConversationListPreferenceController.java

+1 −3
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe 
            populateConversations(conversations, containerGroup);

        }



        if (containerGroup.getPreferenceCount() == 0) {

            containerGroup.setVisible(false);

        } else {

        if (containerGroup.getPreferenceCount() != 0) {

            Preference summaryPref = getSummaryPreference();

            if (summaryPref != null) {

                containerGroup.addPreference(summaryPref);

src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ public class PriorityConversationsPreferenceController extends 
        Preference pref = new Preference(mContext);

        pref.setOrder(1);

        pref.setSummary(R.string.important_conversations_summary_bubbles);

        pref.setSelectable(false);

        return pref;

    }