Fix issue#352 (getodk#368)

refaqtor · Feb 6, 2017 · 7bf48f6 · 7bf48f6
1 parent bdaaeed
commit 7bf48f6
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 26 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/BearingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/BearingActivity.java
@@ -45,7 +45,7 @@ public class BearingActivity extends Activity implements SensorEventListener {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.get_bearing));
+        setTitle(getString(R.string.get_bearing));
 
         mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         accelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/DrawActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/DrawActivity.java
@@ -167,8 +167,7 @@ public void onCreate(Bundle savedInstanceState) {
                     getString(R.string.draw_image));
         }
 
-        setTitle(getString(R.string.app_name) + " > "
-                + getString(R.string.draw_image));
+        setTitle(getString(R.string.draw_image));
 
         LayoutInflater inflater = (LayoutInflater) getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FileManagerTabs.java b/collect_app/src/main/java/org/odk/collect/android/activities/FileManagerTabs.java
@@ -44,8 +44,7 @@ public class FileManagerTabs extends TabActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setTitle(getString(R.string.app_name) + " > "
-                + getString(R.string.manage_files));
+        setTitle(getString(R.string.manage_files));
 
         final TabHost tabHost = getTabHost();
         tabHost.setBackgroundColor(Color.WHITE);

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormChooserList.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormChooserList.java
@@ -66,7 +66,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         setContentView(R.layout.chooser_list_layout);
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.enter_data));
+        setTitle(getString(R.string.enter_data));
 
         String sortOrder = FormsColumns.DISPLAY_NAME + " ASC, " + FormsColumns.JR_VERSION + " DESC";
         Cursor c = managedQuery(FormsColumns.CONTENT_URI, null, null, null, sortOrder);
@@ -175,6 +175,7 @@ protected void onStop() {
     /**
      * Called by DiskSyncTask when the task is finished
      */
+
     @Override
     public void SyncComplete(String result) {
         Log.i(t, "disk sync task complete");

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormDownloadList.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormDownloadList.java
@@ -125,7 +125,7 @@ public class FormDownloadList extends ListActivity implements FormListDownloader
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.remote_file_manage_list);
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.get_forms));
+        setTitle(getString(R.string.get_forms));
         mAlertMsg = getString(R.string.please_wait);
 
         // need white background before load

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java
@@ -239,8 +239,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         setContentView(R.layout.form_entry);
-        setTitle(getString(R.string.app_name) + " > "
-                + getString(R.string.loading_form));
+        setTitle(getString(R.string.loading_form));
 
         mErrorMessage = null;
 
@@ -1058,8 +1057,7 @@ public Object onRetainNonConfigurationInstance() {
     private View createView(int event, boolean advancingPage) {
         FormController formController = Collect.getInstance()
                 .getFormController();
-        setTitle(getString(R.string.app_name) + " > "
-                + formController.getFormTitle());
+        setTitle(formController.getFormTitle());
 
         switch (event) {
             case FormEntryController.EVENT_BEGINNING_OF_FORM:

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java
@@ -71,8 +71,7 @@ public void onCreate(Bundle savedInstanceState) {
         // We use a static FormEntryController to make jumping faster.
         mStartIndex = formController.getFormIndex();
 
-        setTitle(getString(R.string.app_name) + " > "
-                + formController.getFormTitle());
+        setTitle(formController.getFormTitle());
 
         mPath = (TextView) findViewById(R.id.pathtext);
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/GeoPointActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/GeoPointActivity.java
@@ -67,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         }
 
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.get_location));
+        setTitle(getString(R.string.get_location));
 
         mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/GoogleDriveActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/GoogleDriveActivity.java
@@ -159,7 +159,7 @@ public class GoogleDriveActivity extends ListActivity implements GoogleApiClient
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.google_drive));
+        setTitle(getString(R.string.google_drive));
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
         setProgressBarVisibility(true);

diff --git a/...ct_app/src/main/java/org/odk/collect/android/activities/GoogleSheetsUploaderActivity.java b/...ct_app/src/main/java/org/odk/collect/android/activities/GoogleSheetsUploaderActivity.java
@@ -83,7 +83,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mAlertMsg = getString(R.string.please_wait);
         mAlertShowing = false;
 
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.send_data));
+        setTitle(getString(R.string.send_data));
 
         // get any simple saved state...
         // resets alert message and showing dialog if the screen is rotated

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserList.java b/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserList.java
@@ -57,7 +57,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         setContentView(R.layout.chooser_list_layout);
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.review_data));
+        setTitle(getString(R.string.review_data));
         TextView tv = (TextView) findViewById(R.id.status_text);
         tv.setVisibility(View.GONE);
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserTabs.java b/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserTabs.java
@@ -44,7 +44,7 @@ public class InstanceChooserTabs extends TabActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.review_data));
+        setTitle(getString(R.string.review_data));
 
         // create tab host and tweak color
         final TabHost tabHost = getTabHost();

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/InstanceUploaderActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/InstanceUploaderActivity.java
@@ -86,7 +86,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mUploadedInstances = new HashMap<String, String>();
 
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.send_data));
+        setTitle(getString(R.string.send_data));
 
         // get any simple saved state...
         if (savedInstanceState != null) {

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/InstanceUploaderList.java b/collect_app/src/main/java/org/odk/collect/android/activities/InstanceUploaderList.java
@@ -185,8 +185,7 @@ public void onClick(View v) {
         mUploadButton.setEnabled(mSelected.size() > 0);
 
         // set title
-        setTitle(getString(R.string.app_name) + " > "
-                + getString(R.string.send_data));
+        setTitle(getString(R.string.send_data));
 
         // if current activity is being reinitialized due to changing
         // orientation restore all check

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/MainMenuActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/MainMenuActivity.java
@@ -125,8 +125,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     .getVersionedAppName());
         }
 
-        setTitle(getString(R.string.app_name) + " > "
-                + getString(R.string.main_menu));
+        setTitle(getString(R.string.main_menu));
 
         File f = new File(Collect.ODK_ROOT + "/collect.settings");
         if (f.exists()) {

diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/AdminPreferencesActivity.java b/collect_app/src/main/java/org/odk/collect/android/preferences/AdminPreferencesActivity.java
@@ -101,8 +101,7 @@ public class AdminPreferencesActivity extends PreferenceActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTitle(getString(R.string.app_name) + " > "
-                + getString(R.string.admin_preferences));
+        setTitle(getString(R.string.admin_preferences));
 
         PreferenceManager prefMgr = getPreferenceManager();
         prefMgr.setSharedPreferencesName(ADMIN_PREFERENCES);

diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/PreferencesActivity.java b/collect_app/src/main/java/org/odk/collect/android/preferences/PreferencesActivity.java
@@ -138,7 +138,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
 
-        setTitle(getString(R.string.app_name) + " > " + getString(R.string.general_preferences));
+        setTitle(getString(R.string.general_preferences));
 
         // not super safe, but we're just putting in this mode to help
         // administrate
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) { @@
                 }
             }
-            setTitle(getString(R.string.app_name) + " > " + getString(R.string.get_location));
+            setTitle(getString(R.string.get_location));
             mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
@@ Expand Down @@