Merge changes I31066a6f,I081cea0d into sc-dev
* changes:
Fix broken test
Updates to conversation page
diff --git a/res/xml/conversation_list_settings.xml b/res/xml/conversation_list_settings.xml
index f61d201..129533f 100644
--- a/res/xml/conversation_list_settings.xml
+++ b/res/xml/conversation_list_settings.xml
@@ -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>
diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index 0c4f227..2500a22 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -69,9 +69,7 @@
populateConversations(conversations, containerGroup);
}
- if (containerGroup.getPreferenceCount() == 0) {
- containerGroup.setVisible(false);
- } else {
+ if (containerGroup.getPreferenceCount() != 0) {
Preference summaryPref = getSummaryPreference();
if (summaryPref != null) {
containerGroup.addPreference(summaryPref);
diff --git a/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java b/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
index 3888a0a..3fb605b 100644
--- a/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
@@ -55,6 +55,7 @@
Preference pref = new Preference(mContext);
pref.setOrder(1);
pref.setSummary(R.string.important_conversations_summary_bubbles);
+ pref.setSelectable(false);
return pref;
}