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

Commit 15910795 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Track method renames"

parents 8e74ee57 f3c4f68a

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

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class DatePreferenceController extends AbstractPreferenceController 
    public boolean isEnabled() {

        TimeCapabilities timeZoneCapabilities =

                mTimeManager.getTimeCapabilitiesAndConfig().getCapabilities();

        int suggestManualTimeCapability = timeZoneCapabilities.getSuggestManualTimeCapability();

        int suggestManualTimeCapability = timeZoneCapabilities.getSetManualTimeCapability();

        return suggestManualTimeCapability == CAPABILITY_POSSESSED;

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class TimeZonePreferenceController extends AbstractPreferenceController 
        TimeZoneCapabilities timeZoneCapabilities =

                mTimeManager.getTimeZoneCapabilitiesAndConfig().getCapabilities();

        int suggestManualTimeZoneCapability =

                timeZoneCapabilities.getSuggestManualTimeZoneCapability();

                timeZoneCapabilities.getSetManualTimeZoneCapability();

        return suggestManualTimeZoneCapability == CAPABILITY_POSSESSED;

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public class AutoTimePreferenceControllerTest { 
                        : Capabilities.CAPABILITY_NOT_SUPPORTED;

        TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM)

                .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability)

                .setSuggestManualTimeCapability(Capabilities.CAPABILITY_POSSESSED)

                .setSetManualTimeCapability(Capabilities.CAPABILITY_POSSESSED)

                .build();

        TimeConfiguration config = new TimeConfiguration.Builder()

                .setAutoDetectionEnabled(autoEnabled)

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public class AutoTimeZonePreferenceControllerTest { 
        TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(UserHandle.SYSTEM)

                .setConfigureAutoDetectionEnabledCapability(configureAutoDetectionEnabledCapability)

                .setConfigureGeoDetectionEnabledCapability(Capabilities.CAPABILITY_NOT_SUPPORTED)

                .setSuggestManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED)

                .setSetManualTimeZoneCapability(Capabilities.CAPABILITY_POSSESSED)

                .build();

        TimeZoneConfiguration config = new TimeZoneConfiguration.Builder()

                .setAutoDetectionEnabled(autoEnabled)

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class DatePreferenceControllerTest { 
                : Capabilities.CAPABILITY_NOT_SUPPORTED;

        TimeCapabilities capabilities = new TimeCapabilities.Builder(UserHandle.SYSTEM)

                .setConfigureAutoDetectionEnabledCapability(Capabilities.CAPABILITY_POSSESSED)

                .setSuggestManualTimeCapability(suggestManualCapability)

                .setSetManualTimeCapability(suggestManualCapability)

                .build();

        TimeConfiguration config = new TimeConfiguration.Builder()

                .setAutoDetectionEnabled(!suggestManualAllowed)