diff --git a/androidgcs/res/layout/object_browser.xml b/androidgcs/res/layout/object_browser.xml
index 0e402daed..8a7221fb6 100644
--- a/androidgcs/res/layout/object_browser.xml
+++ b/androidgcs/res/layout/object_browser.xml
@@ -78,14 +78,26 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
+
+
+
+
+
+
+
diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java b/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
index 25e8fdab0..b27fef785 100644
--- a/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
+++ b/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
@@ -26,6 +26,7 @@ import android.widget.TextView;
import android.widget.AdapterView.OnItemClickListener;
import org.openpilot.uavtalk.UAVDataObject;
+import org.openpilot.uavtalk.UAVObject;
public class ObjectBrowser extends ObjectManagerActivity implements OnSharedPreferenceChangeListener {
@@ -85,6 +86,24 @@ public class ObjectBrowser extends ObjectManagerActivity implements OnSharedPref
}
}
});
+
+ ((Button) findViewById(R.id.object_load_button)).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ UAVObject objPer = objMngr.getObject("ObjectPersistence");
+
+ if (selected_index > 0 && objPer != null) {
+ objPer.getField("Operation").setValue("Load");
+ objPer.getField("Selection").setValue("SingleObject");
+ Log.d(TAG,"Loading with object id: " + allObjects.get(selected_index).getObjID());
+ objPer.getField("ObjectID").setValue(allObjects.get(selected_index).getObjID());
+ objPer.getField("InstanceID").setValue(0);
+ objPer.updated();
+
+ allObjects.get(selected_index).updateRequested();
+ }
+ }
+ });
updateList();
}