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

Merge "Replace zen setting plurals with MessageFormat"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-08 15:33:39 +00:00
committed by Android (Google) Code Review
parent 4395ef199a c549280a33
commit 864ae39cbe
9 changed files with 174 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
View File

@@ -90,7 +90,6 @@ public class ZenModeDurationPreferenceControllerTest {
Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
zenDuration);
assertEquals(mContext.getString(R.string.zen_mode_duration_summary_time_minutes,
zenDuration), mController.getSummary());
assertEquals("45 minutes", mController.getSummary());
}
}

6
tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
View File

@@ -33,10 +33,6 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModePreferenceController;
import com.android.settings.notification.zen.ZenModeSettings;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -85,7 +81,7 @@ public class ZenModePreferenceControllerTest {
when(mPreference.isEnabled()).thenReturn(true);
mController.updateState(mPreference);
verify(mPreference).setSummary(mContext.getString(R.string.zen_mode_sound_summary_off));
verify(mPreference).setSummary("Off");
doReturn(1).when(mSummaryBuilder).getEnabledAutomaticRulesCount();
mController.updateState(mPreference);