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

Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-21 18:46:23 +00:00
committed by Android (Google) Code Review
parent daeda0525b 9bac8ec684
commit 65220e5cdb
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/dimens.xml
View File

@@ -85,7 +85,7 @@
<dimen name="notification_importance_button_padding">14dp</dimen> <dimen name="notification_importance_button_padding">14dp</dimen>
<dimen name="notification_history_header_drawable_start">26dp</dimen> <dimen name="notification_history_header_drawable_start">26dp</dimen>
<dimen name="conversation_icon_size">48dp</dimen> <dimen name="conversation_icon_size">32dp</dimen>
<dimen name="zen_mode_icon_size">36dp</dimen> <dimen name="zen_mode_icon_size">36dp</dimen>
<dimen name="zen_mode_icon_margin">16dp</dimen> <dimen name="zen_mode_icon_margin">16dp</dimen>

3
src/com/android/settings/notification/app/AppConversationListPreferenceController.java
View File

@@ -33,6 +33,7 @@ import com.android.settings.R;
import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.widget.AppPreference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -144,7 +145,7 @@ public class AppConversationListPreferenceController extends NotificationPrefere
} }
protected Preference createConversationPref(final ConversationChannelWrapper conversation) { protected Preference createConversationPref(final ConversationChannelWrapper conversation) {
Preference pref = new Preference(mContext); AppPreference pref = new AppPreference(mContext);
populateConversationPreference(conversation, pref); populateConversationPreference(conversation, pref);
return pref; return pref;
} }

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

@@ -18,7 +18,6 @@ package com.android.settings.notification.app;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
@@ -34,6 +33,7 @@ import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.AppPreference;
import java.text.Collator; import java.text.Collator;
import java.util.Comparator; import java.util.Comparator;
@@ -96,7 +96,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
protected Preference createConversationPref(final ConversationChannelWrapper conversation, protected Preference createConversationPref(final ConversationChannelWrapper conversation,
int order) { int order) {
Preference pref = new Preference(mContext); AppPreference pref = new AppPreference(mContext);
pref.setOrder(order); pref.setOrder(order);
pref.setTitle(getTitle(conversation)); pref.setTitle(getTitle(conversation));