Change namespace for time_help_and_feedback_feature_supported server flag
This change moves the time_help_and_feedback_feature_supported flag from the settings_ui namespace to the system_time namespace. Flag: EXEMPT refactor Bug: 283239837 Change-Id: Ic1fcafd3cdbd263d7b800ac7676701628361de63
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.android.settings.datetime;
|
package com.android.settings.datetime;
|
||||||
|
|
||||||
import static android.provider.DeviceConfig.NAMESPACE_SETTINGS_UI;
|
import static android.provider.DeviceConfig.NAMESPACE_SYSTEM_TIME;
|
||||||
|
|
||||||
import android.provider.DeviceConfig;
|
import android.provider.DeviceConfig;
|
||||||
|
|
||||||
@@ -47,6 +47,6 @@ final class DateTimeLaunchUtils {
|
|||||||
private static boolean isFeedbackFeatureSupportedOnThisDevice() {
|
private static boolean isFeedbackFeatureSupportedOnThisDevice() {
|
||||||
boolean defaultIsSupported = false;
|
boolean defaultIsSupported = false;
|
||||||
return DeviceConfig.getBoolean(
|
return DeviceConfig.getBoolean(
|
||||||
NAMESPACE_SETTINGS_UI, KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, defaultIsSupported);
|
NAMESPACE_SYSTEM_TIME, KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, defaultIsSupported);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package com.android.settings.datetime;
|
package com.android.settings.datetime;
|
||||||
|
|
||||||
import static android.provider.DeviceConfig.NAMESPACE_SETTINGS_UI;
|
import static android.provider.DeviceConfig.NAMESPACE_SYSTEM_TIME;
|
||||||
|
|
||||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||||
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
||||||
@@ -93,7 +93,7 @@ public class TimeFeedbackPreferenceControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
@EnableFlags({Flags.FLAG_DATETIME_FEEDBACK})
|
@EnableFlags({Flags.FLAG_DATETIME_FEEDBACK})
|
||||||
public void validIntentUri_targetHandlerNotFound_returnsConditionallyUnavailable() {
|
public void validIntentUri_targetHandlerNotFound_returnsConditionallyUnavailable() {
|
||||||
DeviceConfig.setProperty(NAMESPACE_SETTINGS_UI,
|
DeviceConfig.setProperty(NAMESPACE_SYSTEM_TIME,
|
||||||
DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true);
|
DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true);
|
||||||
when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(null);
|
when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(null);
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ public class TimeFeedbackPreferenceControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
@EnableFlags({Flags.FLAG_DATETIME_FEEDBACK})
|
@EnableFlags({Flags.FLAG_DATETIME_FEEDBACK})
|
||||||
public void validIntentUri_targetHandlerAvailable_returnsAvailable() {
|
public void validIntentUri_targetHandlerAvailable_returnsAvailable() {
|
||||||
DeviceConfig.setProperty(NAMESPACE_SETTINGS_UI,
|
DeviceConfig.setProperty(NAMESPACE_SYSTEM_TIME,
|
||||||
DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true);
|
DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true);
|
||||||
when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(
|
when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(
|
||||||
createDummyResolveInfo());
|
createDummyResolveInfo());
|
||||||
|
Reference in New Issue
Block a user