Rename refresh to sync now

This commit is contained in:
Jimmy Shih
2013-12-09 14:42:10 -08:00
parent a28c39bea9
commit 61cf316fb5
12 changed files with 32 additions and 32 deletions

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

+3 -3
View File
@@ -31,9 +31,9 @@ limitations under the License.
android:id="@+id/track_list_play_mutliple"
android:title="@string/menu_play_multiple"/>
<item
android:icon="@drawable/ic_menu_refresh"
android:id="@+id/track_list_refresh"
android:title="@string/menu_refresh"/>
android:icon="@drawable/ic_menu_sync_now"
android:id="@+id/track_list_sync_now"
android:title="@string/menu_sync_now"/>
<item
android:icon="@drawable/ic_menu_aggregated_statistics"
android:id="@+id/track_list_aggregated_statistics"
+6 -6
View File
@@ -1200,12 +1200,6 @@ limitations under the License.
Character limit: ~20 (1 line)">
Play multiple
</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.
@@ -1256,6 +1250,12 @@ limitations under the License.
Character limit: ~20 (1 line)">
Sync to Google Drive
</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_show_on_map"
translation_description="In the menu, to show a track or a marker on the map.
@@ -307,7 +307,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
// Menu items
private MenuItem searchMenuItem;
private MenuItem startGpsMenuItem;
private MenuItem refreshMenuItem;
private MenuItem syncNowMenuItem;
private MenuItem exportAllMenuItem;
private MenuItem importAllMenuItem;
private MenuItem deleteAllMenuItem;
@@ -469,7 +469,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
ApiAdapterFactory.getApiAdapter().configureSearchWidget(this, searchMenuItem, trackController);
startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
refreshMenuItem = menu.findItem(R.id.track_list_refresh);
syncNowMenuItem = menu.findItem(R.id.track_list_sync_now);
exportAllMenuItem = menu.findItem(R.id.track_list_export_all);
importAllMenuItem = menu.findItem(R.id.track_list_import_all);
deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all);
@@ -533,7 +533,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
PlayMultipleDialogFragment.newInstance(-1L)
.show(getSupportFragmentManager(), PlayMultipleDialogFragment.PLAY_MULTIPLE_DIALOG_TAG);
return true;
case R.id.track_list_refresh:
case R.id.track_list_sync_now:
if (driveSync) {
SyncUtils.syncNow(this);
} else {
@@ -739,8 +739,8 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
TrackIconUtils.setMenuIconColor(startGpsMenuItem);
}
}
if (refreshMenuItem != null) {
refreshMenuItem.setTitle(driveSync ? R.string.menu_refresh : R.string.menu_sync_drive);
if (syncNowMenuItem != null) {
syncNowMenuItem.setTitle(driveSync ? R.string.menu_sync_now : R.string.menu_sync_drive);
}
if (exportAllMenuItem != null) {
exportAllMenuItem.setVisible(!isRecording);