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

Commit ca552d4e authored by Kanyinsola Fapohunda's avatar Kanyinsola Fapohunda Committed by Android (Google) Code Review
Browse files

Merge "Change namespace for time_help_and_feedback_feature_supported server flag" into main

parents 5e79d186 c9569b1c

src/com/android/settings/datetime/DateTimeLaunchUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

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;
@@ -47,6 +47,6 @@ final class DateTimeLaunchUtils { 
    private static boolean isFeedbackFeatureSupportedOnThisDevice() {

        boolean defaultIsSupported = false;

        return DeviceConfig.getBoolean(

                NAMESPACE_SETTINGS_UI, KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, defaultIsSupported);

                NAMESPACE_SYSTEM_TIME, KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, defaultIsSupported);

    }

}

tests/robotests/src/com/android/settings/datetime/TimeFeedbackPreferenceControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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.CONDITIONALLY_UNAVAILABLE;
@@ -93,7 +93,7 @@ public class TimeFeedbackPreferenceControllerTest { 
    @Test

    @EnableFlags({Flags.FLAG_DATETIME_FEEDBACK})

    public void validIntentUri_targetHandlerNotFound_returnsConditionallyUnavailable() {

        DeviceConfig.setProperty(NAMESPACE_SETTINGS_UI,

        DeviceConfig.setProperty(NAMESPACE_SYSTEM_TIME,

                DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true);

        when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(null);
@@ -107,7 +107,7 @@ public class TimeFeedbackPreferenceControllerTest { 
    @Test

    @EnableFlags({Flags.FLAG_DATETIME_FEEDBACK})

    public void validIntentUri_targetHandlerAvailable_returnsAvailable() {

        DeviceConfig.setProperty(NAMESPACE_SETTINGS_UI,

        DeviceConfig.setProperty(NAMESPACE_SYSTEM_TIME,

                DateTimeLaunchUtils.KEY_HELP_AND_FEEDBACK_FEATURE_SUPPORTED, "true", true);

        when(mMockPackageManager.resolveActivity(any(), anyInt())).thenReturn(

                createDummyResolveInfo());