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

Commit 816797ab authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Translate default channel on locale change 

Change-Id: I4c45f7879d0c68e866b5d55a4fbb2402f62159a2
Fixes: 64025105
Test: runtest systemui-notification
parent fa206a4d

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ public class NotificationManagerService extends SystemService { 
        public void onReceive(Context context, Intent intent) {

            if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {

                mZenModeHelper.updateDefaultZenRules();

                mRankingHelper.onLocaleChanged(context, ActivityManager.getCurrentUser());

            }

        }

    };

services/core/java/com/android/server/notification/RankingHelper.java

+16 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,22 @@ public class RankingHelper implements RankingConfig { 
        }

    }



    protected void onLocaleChanged(Context context, int userId) {

        synchronized (mRecords) {

            int N = mRecords.size();

            for (int i = 0; i < N; i++) {

                Record record = mRecords.valueAt(i);

                if (UserHandle.getUserId(record.uid) == userId) {

                    if (record.channels.containsKey(NotificationChannel.DEFAULT_CHANNEL_ID)) {

                        record.channels.get(NotificationChannel.DEFAULT_CHANNEL_ID).setName(

                                context.getResources().getString(

                                        R.string.default_notification_channel_label));

                    }

                }

            }

        }

    }



    public void onPackagesChanged(boolean removingPackage, int changeUserId, String[] pkgList,

            int[] uidList) {

        if (pkgList == null || pkgList.length == 0) {

services/tests/notification/src/com/android/server/notification/RankingHelperTest.java

+22 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.app.NotificationChannel; 
import android.app.NotificationManager;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.graphics.Color;

import android.media.AudioAttributes;

import android.net.Uri;
@@ -78,6 +79,7 @@ import static org.junit.Assert.assertTrue; 
import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -127,6 +129,8 @@ public class RankingHelperTest extends NotificationTestCase { 
        when(mPm.getPackageUidAsUser(eq(UPDATED_PKG), anyInt())).thenReturn(UID2);

        when(mContext.getResources()).thenReturn(

                InstrumentationRegistry.getContext().getResources());

        when(mContext.getContentResolver()).thenReturn(

                InstrumentationRegistry.getContext().getContentResolver());

        when(mContext.getPackageManager()).thenReturn(mPm);

        when(mContext.getApplicationInfo()).thenReturn(legacy);

        // most tests assume badging is enabled
@@ -1366,4 +1370,22 @@ public class RankingHelperTest extends NotificationTestCase { 
        assertFalse(mHelper.badgingEnabled(USER));

        assertTrue(mHelper.badgingEnabled(USER2));

    }



    @Test

    public void testOnLocaleChanged_updatesDefaultChannels() throws Exception {

        String newLabel = "bananas!";

        final NotificationChannel defaultChannel = mHelper.getNotificationChannel(PKG, UID,

                NotificationChannel.DEFAULT_CHANNEL_ID, false);

        assertFalse(newLabel.equals(defaultChannel.getName()));



        Resources res = mock(Resources.class);

        when(mContext.getResources()).thenReturn(res);

        when(res.getString(com.android.internal.R.string.default_notification_channel_label))

                .thenReturn(newLabel);



        mHelper.onLocaleChanged(mContext, USER.getIdentifier());



        assertEquals(newLabel, mHelper.getNotificationChannel(PKG, UID,

                NotificationChannel.DEFAULT_CHANNEL_ID, false).getName());

    }

}