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

Changes for renamed API

Browse Source 
Test: atest
Bug: 130224929
Change-Id: Ia5003a31153da74347a3251a71dfcd423e65a462
This commit is contained in:
Julia Reynolds
2019-04-10 12:44:10 -04:00
parent b2bf285911
commit 002f8a09d3
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/AssistantCapabilityPreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.notification;
import android.content.Context;
import android.os.UserHandle;
import android.service.notification.Adjustment;
import com.android.settings.core.TogglePreferenceController;
@@ -44,7 +43,7 @@ public class AssistantCapabilityPreferenceController extends TogglePreferenceCon
@Override
public boolean isChecked() {
List<String> capabilities = mBackend.getAssistantCapabilities(mContext.getPackageName());
List<String> capabilities = mBackend.getAssistantAdjustments(mContext.getPackageName());
if (PRIORITIZER_KEY.equals(getPreferenceKey())) {
return capabilities.contains(Adjustment.KEY_IMPORTANCE);
} else if (SMART_KEY.equals(getPreferenceKey())) {
@@ -57,10 +56,10 @@ public class AssistantCapabilityPreferenceController extends TogglePreferenceCon
@Override
public boolean setChecked(boolean isChecked) {
if (PRIORITIZER_KEY.equals(getPreferenceKey())) {
mBackend.allowAssistantCapability(Adjustment.KEY_IMPORTANCE, isChecked);
mBackend.allowAssistantAdjustment(Adjustment.KEY_IMPORTANCE, isChecked);
} else if (SMART_KEY.equals(getPreferenceKey())) {
mBackend.allowAssistantCapability(Adjustment.KEY_CONTEXTUAL_ACTIONS, isChecked);
mBackend.allowAssistantCapability(Adjustment.KEY_TEXT_REPLIES, isChecked);
mBackend.allowAssistantAdjustment(Adjustment.KEY_CONTEXTUAL_ACTIONS, isChecked);
mBackend.allowAssistantAdjustment(Adjustment.KEY_TEXT_REPLIES, isChecked);
}
return true;
}

10
src/com/android/settings/notification/NotificationBackend.java
View File

@@ -339,21 +339,21 @@ public class NotificationBackend {
}
}
public void allowAssistantCapability(String capability, boolean allowed) {
public void allowAssistantAdjustment(String capability, boolean allowed) {
try {
if (allowed) {
sINM.allowAssistantCapability(capability);
sINM.allowAssistantAdjustment(capability);
} else {
sINM.disallowAssistantCapability(capability);
sINM.disallowAssistantAdjustment(capability);
}
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
}
}
public List<String> getAssistantCapabilities(String pkg) {
public List<String> getAssistantAdjustments(String pkg) {
try {
return sINM.getAllowedAssistantCapabilities(pkg);
return sINM.getAllowedAssistantAdjustments(pkg);
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
}

24
tests/robotests/src/com/android/settings/notification/AssistantCapabilityPreferenceControllerTest.java
View File

@@ -101,7 +101,7 @@ public class AssistantCapabilityPreferenceControllerTest {
public void isChecked_prioritizerSettingIsOff_false() {
List<String> capabilities = new ArrayList<>();
capabilities.add(Adjustment.KEY_USER_SENTIMENT);
when(mBackend.getAssistantCapabilities(anyString())).thenReturn(capabilities);
when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
assertThat(mPrioritizerController.isChecked()).isFalse();
}
@@ -109,7 +109,7 @@ public class AssistantCapabilityPreferenceControllerTest {
public void isChecked_prioritizerSettingIsOn_true() {
List<String> capabilities = new ArrayList<>();
capabilities.add(Adjustment.KEY_IMPORTANCE);
when(mBackend.getAssistantCapabilities(anyString())).thenReturn(capabilities);
when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
assertThat(mPrioritizerController.isChecked()).isTrue();
}
@@ -117,17 +117,17 @@ public class AssistantCapabilityPreferenceControllerTest {
public void isChecked_chipSettingIsOff_false() {
List<String> capabilities = new ArrayList<>();
capabilities.add(Adjustment.KEY_IMPORTANCE);
when(mBackend.getAssistantCapabilities(anyString())).thenReturn(capabilities);
when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
assertThat(mChipController.isChecked()).isFalse();
capabilities = new ArrayList<>();
capabilities.add(Adjustment.KEY_CONTEXTUAL_ACTIONS);
when(mBackend.getAssistantCapabilities(anyString())).thenReturn(capabilities);
when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
assertThat(mChipController.isChecked()).isFalse();
capabilities = new ArrayList<>();
capabilities.add(Adjustment.KEY_TEXT_REPLIES);
when(mBackend.getAssistantCapabilities(anyString())).thenReturn(capabilities);
when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
assertThat(mChipController.isChecked()).isFalse();
}
@@ -136,34 +136,34 @@ public class AssistantCapabilityPreferenceControllerTest {
List<String> capabilities = new ArrayList<>();
capabilities.add(Adjustment.KEY_TEXT_REPLIES);
capabilities.add(Adjustment.KEY_CONTEXTUAL_ACTIONS);
when(mBackend.getAssistantCapabilities(anyString())).thenReturn(capabilities);
when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
assertThat(mChipController.isChecked()).isTrue();
}
@Test
public void onPreferenceChange_prioritizerOn() {
mPrioritizerController.onPreferenceChange(mPrioritizerPreference, true);
verify(mBackend).allowAssistantCapability(Adjustment.KEY_IMPORTANCE, true);
verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_IMPORTANCE, true);
}
@Test
public void onPreferenceChange_prioritizerOff() {
mPrioritizerController.onPreferenceChange(mPrioritizerPreference, false);
verify(mBackend).allowAssistantCapability(Adjustment.KEY_IMPORTANCE, false);
verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_IMPORTANCE, false);
}
@Test
public void onPreferenceChange_chipsOn() {
mChipController.onPreferenceChange(mChipPreference, true);
verify(mBackend).allowAssistantCapability(Adjustment.KEY_CONTEXTUAL_ACTIONS, true);
verify(mBackend).allowAssistantCapability(Adjustment.KEY_TEXT_REPLIES, true);
verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_CONTEXTUAL_ACTIONS, true);
verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_TEXT_REPLIES, true);
}
@Test
public void onPreferenceChange_chipsOff() {
mChipController.onPreferenceChange(mChipPreference, false);
verify(mBackend).allowAssistantCapability(Adjustment.KEY_CONTEXTUAL_ACTIONS, false);
verify(mBackend).allowAssistantCapability(Adjustment.KEY_TEXT_REPLIES, false);
verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_CONTEXTUAL_ACTIONS, false);
verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_TEXT_REPLIES, false);
}
}