Code cleanup, move google location settings logic to GoogleLocationUtils

This commit is contained in:
Jimmy Shih
2013-11-26 13:01:12 -08:00
parent abcf7cddff
commit 8bb8a1c266
4 changed files with 95 additions and 52 deletions
@@ -53,7 +53,7 @@ public class GoToMyLocationTest extends ActivityInstrumentationTestCase2<TrackLi
EndToEndTestUtils.findAndClickMyLocation(activityMyTracks);
if (EndToEndTestUtils.isEmulator) {
String setting = activityMyTracks.getString(
GoogleLocationUtils.isAvailable(activityMyTracks) ? R.string.gps_google_location_settings
GoogleLocationUtils.isEnforceable(activityMyTracks) ? R.string.gps_google_location_settings
: R.string.gps_location_access);
EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.my_location_no_gps, setting), 1,