forked from upstream-mirrors/OpenTracks
Rename sync now to refresh
This commit is contained in:
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
@@ -27,9 +27,9 @@ limitations under the License.
|
||||
android:showAsAction="ifRoom"
|
||||
android:title="@string/menu_start_gps"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_sync_now"
|
||||
android:id="@+id/track_list_sync_now"
|
||||
android:title="@string/menu_sync_now"/>
|
||||
android:icon="@drawable/menu_refresh"
|
||||
android:id="@+id/track_list_refresh"
|
||||
android:title="@string/menu_refresh"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_aggregated_statistics"
|
||||
android:id="@+id/track_list_aggregated_statistics"
|
||||
|
||||
@@ -1129,6 +1129,12 @@ limitations under the License.
|
||||
Character limit: ~20 (1 line)">
|
||||
Play
|
||||
</string>
|
||||
<string name="menu_refresh"
|
||||
translation_description="In the menu, to refresh with Google Drive.
|
||||
|
||||
Character limit: ~20 (1 line)">
|
||||
Refresh
|
||||
</string>
|
||||
<string name="menu_satellite"
|
||||
translation_description="In the menu, under the map layer option, the submenu to display
|
||||
satellite.
|
||||
@@ -1192,12 +1198,6 @@ limitations under the License.
|
||||
Character limit: ~20 (1 line)">
|
||||
Stop GPS
|
||||
</string>
|
||||
<string name="menu_sync_now"
|
||||
translation_description="In the menu, to sync now with Google Drive.
|
||||
|
||||
Character limit: ~20 (1 line)">
|
||||
Sync now
|
||||
</string>
|
||||
<string name="menu_terrain"
|
||||
translation_description="In the menu, under the map layer option, the submenu to display
|
||||
terrain.
|
||||
|
||||
@@ -284,7 +284,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
|
||||
private MenuItem importAllMenuItem;
|
||||
private MenuItem exportAllMenuItem;
|
||||
private MenuItem deleteAllMenuItem;
|
||||
private MenuItem syncNowMenuItem;
|
||||
private MenuItem refreshMenuItem;
|
||||
private MenuItem feedbackMenuItem;
|
||||
|
||||
private boolean startGps = false; // true to start gps
|
||||
@@ -460,7 +460,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
|
||||
importAllMenuItem = menu.findItem(R.id.track_list_import_all);
|
||||
exportAllMenuItem = menu.findItem(R.id.track_list_export_all);
|
||||
deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all);
|
||||
syncNowMenuItem = menu.findItem(R.id.track_list_sync_now);
|
||||
refreshMenuItem = menu.findItem(R.id.track_list_refresh);
|
||||
feedbackMenuItem = menu.findItem(R.id.track_list_feedback);
|
||||
feedbackMenuItem.setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
|
||||
|
||||
@@ -539,7 +539,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
|
||||
intent = IntentUtils.newIntent(this, AggregatedStatsActivity.class);
|
||||
startActivity(intent);
|
||||
return true;
|
||||
case R.id.track_list_sync_now:
|
||||
case R.id.track_list_refresh:
|
||||
SyncUtils.syncNow(this);
|
||||
return true;
|
||||
case R.id.track_list_settings:
|
||||
@@ -724,8 +724,8 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
|
||||
if (deleteAllMenuItem != null) {
|
||||
deleteAllMenuItem.setVisible(!isRecording);
|
||||
}
|
||||
if (syncNowMenuItem != null) {
|
||||
syncNowMenuItem.setVisible(driveSync);
|
||||
if (refreshMenuItem != null) {
|
||||
refreshMenuItem.setVisible(driveSync);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user