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

Commit fa6829a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: Ie481fef6a8015206ffd822a6177e1b453cf41fb9
parents d9322685 65220e5c

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
    <dimen name="notification_importance_button_padding">14dp</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_margin">16dp</dimen>

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.settings.R; 
import com.android.settings.applications.AppInfoBase;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.notification.NotificationBackend;

import com.android.settingslib.widget.AppPreference;



import java.util.ArrayList;

import java.util.Collections;
@@ -144,7 +145,7 @@ public class AppConversationListPreferenceController extends NotificationPrefere 
    }



    protected Preference createConversationPref(final ConversationChannelWrapper conversation) {

        Preference pref = new Preference(mContext);

        AppPreference pref = new AppPreference(mContext);

        populateConversationPreference(conversation, pref);

        return pref;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.notification.app; 


import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ShortcutInfo;

import android.os.Bundle;

import android.os.UserHandle;
@@ -34,6 +33,7 @@ import com.android.settings.applications.AppInfoBase; 
import com.android.settings.core.SubSettingLauncher;

import com.android.settings.notification.NotificationBackend;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.widget.AppPreference;



import java.text.Collator;

import java.util.Comparator;
@@ -96,7 +96,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe 


    protected Preference createConversationPref(final ConversationChannelWrapper conversation,

            int order) {

        Preference pref = new Preference(mContext);

        AppPreference pref = new AppPreference(mContext);

        pref.setOrder(order);



        pref.setTitle(getTitle(conversation));