PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I31066a6f,I081cea0d into sc-dev

Browse Source 
* changes:
  Fix broken test
  Updates to conversation page
This commit is contained in:
Julia Reynolds
2021-06-07 14:50:00 +00:00
committed by Android (Google) Code Review
parent bd1c4e5fa1 c94f997a2f
commit 6d6280c634
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/xml/conversation_list_settings.xml
View File

@@ -29,18 +29,10 @@
<PreferenceCategory <PreferenceCategory
android:key="important_conversations" android:key="important_conversations"
android:title="@string/important_conversations" android:title="@string/important_conversations"
settings:isPreferenceVisible="false" settings:isPreferenceVisible="false" >
settings:allowDividerAbove="false"
settings:allowDividerBelow="true" >
<Preference
android:key="behavior"
android:selectable="false"
android:summary="@string/important_conversation_behavior_summary"/>
<!-- Important conversations added here --> <!-- Important conversations added here -->
<PreferenceCategory <PreferenceCategory
android:key="important_conversations_list" android:key="important_conversations_list" >
settings:allowDividerAbove="false"
settings:allowDividerBelow="false" >
</PreferenceCategory> </PreferenceCategory>
</PreferenceCategory> </PreferenceCategory>
@@ -48,16 +40,12 @@
<PreferenceCategory <PreferenceCategory
android:title="@string/other_conversations" android:title="@string/other_conversations"
android:key="other_conversations" android:key="other_conversations"
settings:isPreferenceVisible="false" settings:isPreferenceVisible="false" />
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
<!-- Recent conversations added here --> <!-- Recent conversations added here -->
<PreferenceCategory <PreferenceCategory
android:title="@string/recent_conversations" android:title="@string/recent_conversations"
android:key="recent_conversations" android:key="recent_conversations"
settings:isPreferenceVisible="false" settings:isPreferenceVisible="false"/>
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
</PreferenceScreen> </PreferenceScreen>

4
src/com/android/settings/notification/app/ConversationListPreferenceController.java
View File

@@ -69,9 +69,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
populateConversations(conversations, containerGroup); populateConversations(conversations, containerGroup);
} }
if (containerGroup.getPreferenceCount() == 0) { if (containerGroup.getPreferenceCount() != 0) {
containerGroup.setVisible(false);
} else {
Preference summaryPref = getSummaryPreference(); Preference summaryPref = getSummaryPreference();
if (summaryPref != null) { if (summaryPref != null) {
containerGroup.addPreference(summaryPref); containerGroup.addPreference(summaryPref);

1
src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
View File

@@ -55,6 +55,7 @@ public class PriorityConversationsPreferenceController extends
Preference pref = new Preference(mContext); Preference pref = new Preference(mContext);
pref.setOrder(1); pref.setOrder(1);
pref.setSummary(R.string.important_conversations_summary_bubbles); pref.setSummary(R.string.important_conversations_summary_bubbles);
pref.setSelectable(false);
return pref; return pref;
} }