diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index de2637f05..db3d21f0d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -71,8 +71,8 @@
If you are overriding this method with your own custom content, + * consider including the standard layout {@link android.R.layout#list_content} + * in your layout file, so that you continue to retain all of the standard + * behavior of ListFragment. In particular, this is currently the only + * way to have the built-in indeterminant progress state be shown. + */ + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + FrameLayout root = new FrameLayout(getActivity()); + + FrameLayout lframe = new FrameLayout(getActivity()); + lframe.setId(INTERNAL_LIST_CONTAINER_ID); + + TextView tv = new TextView(getActivity()); + tv.setId(INTERNAL_EMPTY_ID); + tv.setGravity(Gravity.CENTER); + lframe.addView(tv, + new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); + + ExpandableListView lv = new ExpandableListView(getActivity()); + lv.setId(android.R.id.list); + lv.setDrawSelectorOnTop(false); + lv.setOnChildClickListener(this); + lv.setOnGroupExpandListener(this); + lv.setOnGroupCollapseListener(this); + + lframe.addView(lv, + new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); + + root.addView(lframe, new FrameLayout.LayoutParams( + ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); + + ListView.LayoutParams lp = + new ListView.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT); + root.setLayoutParams(lp); + + return root; + } + + /** + * Attach to list view once the view hierarchy has been created. + */ + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + ensureList(); + } + + /** Detach from list view. */ + @Override + public void onDestroyView() { + mHandler.removeCallbacks(mRequestFocus); + mList = null; + super.onDestroyView(); + } + + /** + * This method will be called when an item in the list is selected. + * Subclasses should override. Subclasses can call + * getListView().getItemAtPosition(position) if they need to access the + * data associated with the selected item. + * @param l The ListView where the click happened + * @param v The view that was clicked within the ListView + * @param position The position of the view in the list + * @param id The row id of the item that was clicked + */ + public void onListItemClick(ListView l, View v, int position, long id) { + } + + /** Provide the cursor for the list view. */ + public void setListAdapter(ExpandableListAdapter adapter) { + boolean hadAdapter = mAdapter != null; + mAdapter = adapter; + if (mList != null) { + mList.setAdapter((ExpandableListAdapter) null); + mList.setAdapter(adapter); + if (!mListShown && !hadAdapter) { + // The list was hidden, and previously didn't have an + // adapter. It is now time to show it. + setListShown(true, getView().getWindowToken() != null); + } + } + } + + /** + * Set the currently selected list item to the specified + * position with the adapter's data + */ + public void setSelection(int position) { + ensureList(); + mList.setSelection(position); + } + + public long getSelectedPosition() { + ensureList(); + return mList.getSelectedPosition(); + } + + public long getSelectedId() { + ensureList(); + return mList.getSelectedId(); + } + + public ExpandableListView getExpandableListView() { + ensureList(); + return mList; + } + + /** + * The default content for a ListFragment has a TextView that can + * be shown when the list is empty. If you would like to have it + * shown, call this method to supply the text it should use. + */ + public void setEmptyText(CharSequence text) { + ensureList(); + if (mStandardEmptyView == null) { + throw new IllegalStateException("Can't be used with a custom content view"); + } + mStandardEmptyView.setText(text); + if (!mSetEmptyText) { + mList.setEmptyView(mStandardEmptyView); + mSetEmptyText = true; + } + } + + /** + * Control whether the list is being displayed. You can make it not + * displayed if you are waiting for the initial data to show in it. During + * this time an indeterminant progress indicator will be shown instead. + *
+ *Applications do not normally need to use this themselves. The default
+ * behavior of ListFragment is to start with the list not being shown, only
+ * showing it once an adapter is given with {@link #setListAdapter(ListAdapter)}.
+ * If the list at that point had not been shown, when it does get shown
+ * it will be do without the user ever seeing the hidden state.
+ * @param shown If true, the list view is shown; if false, the progress
+ * indicator. The initial value is true.
+ */
+ public void setListShown(boolean shown) {
+ setListShown(shown, true);
+ }
+
+ /**
+ * Like {@link #setListShown(boolean)}, but no animation is used when
+ * transitioning from the previous state.
+ */
+ public void setListShownNoAnimation(boolean shown) {
+ setListShown(shown, false);
+ }
+
+ /**
+ * Control whether the list is being displayed. You can make it not
+ * displayed if you are waiting for the initial data to show in it. During
+ * this time an indeterminant progress indicator will be shown instead.
+ * @param shown If true, the list view is shown; if false, the progress
+ * indicator. The initial value is true.
+ * @param animate If true, an animation will be used to transition to the
+ * new state.
+ */
+ private void setListShown(boolean shown, boolean animate) {
+ ensureList();
+ if (mListShown == shown) {
+ return;
+ }
+ mListShown = shown;
+ if (mListContainer != null) {
+ if (shown) {
+ if (animate) {
+ mListContainer.startAnimation(AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in));
+ }
+ mListContainer.setVisibility(View.VISIBLE);
+ } else {
+ if (animate) {
+ mListContainer.startAnimation(AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_out));
+ }
+ mListContainer.setVisibility(View.GONE);
+ }
+ }
+ }
+
+ /** Get the ListAdapter associated with this activity's ListView. */
+ public ExpandableListAdapter getExpandableListAdapter() {
+ return mAdapter;
+ }
+
+ private void ensureList() {
+ if (mList != null) {
+ return;
+ }
+ View root = getView();
+ if (root == null) {
+ throw new IllegalStateException("Content view not yet created");
+ }
+ if (root instanceof ExpandableListView) {
+ mList = (ExpandableListView) root;
+ } else {
+ mStandardEmptyView = (TextView) root.findViewById(INTERNAL_EMPTY_ID);
+ if (mStandardEmptyView == null) {
+ mEmptyView = root.findViewById(android.R.id.empty);
+ }
+ mListContainer = root.findViewById(INTERNAL_LIST_CONTAINER_ID);
+ View rawListView = root.findViewById(android.R.id.list);
+ if (!(rawListView instanceof ExpandableListView)) {
+ if (rawListView == null) {
+ throw new RuntimeException("Your content must have a ExpandableListView whose id attribute is " +
+ "'android.R.id.list'");
+ }
+ throw new RuntimeException("Content has view with id attribute 'android.R.id.list' " +
+ "that is not a ExpandableListView class");
+ }
+ mList = (ExpandableListView) rawListView;
+ if (mEmptyView != null) {
+ mList.setEmptyView(mEmptyView);
+ }
+ }
+ mListShown = true;
+ mList.setOnItemClickListener(mOnClickListener);
+ if (mAdapter != null) {
+ setListAdapter(mAdapter);
+ } else {
+ // We are starting without an adapter, so assume we won't
+ // have our data right away and start with the progress indicator.
+ setListShown(false, false);
+ }
+ mHandler.post(mRequestFocus);
+ }
+
+ @Override
+ public void onGroupExpand(int arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onGroupCollapse(int arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public boolean onChildClick(ExpandableListView arg0, View arg1, int arg2, int arg3, long arg4) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+ }
+
+ public void onContentChanged() {
+ View emptyView = getView().findViewById(android.R.id.empty);
+ mList = (ExpandableListView) getView().findViewById(android.R.id.list);
+ if (mList == null) {
+ throw new RuntimeException(
+ "Your content must have a ExpandableListView whose id attribute is " + "'android.R.id.list'");
+ }
+ if (emptyView != null) {
+ mList.setEmptyView(emptyView);
+ }
+ mList.setOnChildClickListener(this);
+ mList.setOnGroupExpandListener(this);
+ mList.setOnGroupCollapseListener(this);
+
+ if (mFinishedStart) {
+ setListAdapter(mAdapter);
+ }
+ mFinishedStart = true;
+ }
+}
+
diff --git a/android/src/net/sf/openrocket/android/util/PersistentExpandableListFragment.java b/android/src/net/sf/openrocket/android/util/PersistentExpandableListFragment.java
new file mode 100644
index 000000000..1cc8e6590
--- /dev/null
+++ b/android/src/net/sf/openrocket/android/util/PersistentExpandableListFragment.java
@@ -0,0 +1,145 @@
+package net.sf.openrocket.android.util;
+
+/*
+ * TODO - this isn't working.
+ */
+import java.util.ArrayList;
+import java.util.List;
+
+import android.os.Bundle;
+import android.widget.ExpandableListAdapter;
+import android.widget.ExpandableListView;
+
+public class PersistentExpandableListFragment extends ExpandableListFragment {
+ private long[] expandedIds;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ AndroidLogWrapper.d(PersistentExpandableListFragment.class, "onCreate");
+ super.onCreate(savedInstanceState);
+ if ( savedInstanceState != null ) {
+ expandedIds = savedInstanceState.getLongArray("ExpandedIds");
+ }
+ }
+
+ @Override
+ public void onStop() {
+ AndroidLogWrapper.d(PersistentExpandableListFragment.class, "onStop");
+ super.onStop();
+ expandedIds = getExpandedIds();
+ }
+
+ @Override
+ public void onStart() {
+ AndroidLogWrapper.d(PersistentExpandableListFragment.class, "onStart");
+ super.onStart();
+ if (this.expandedIds != null) {
+ restoreExpandedState(expandedIds);
+ }
+ }
+
+ @Override
+ public void onPause() {
+ AndroidLogWrapper.d(PersistentExpandableListFragment.class, "onPause");
+ super.onPause();
+ expandedIds = getExpandedIds();
+ }
+
+
+ @Override
+ public void onResume() {
+ AndroidLogWrapper.d(PersistentExpandableListFragment.class, "onResume");
+ super.onResume();
+ if (this.expandedIds != null) {
+ restoreExpandedState(expandedIds);
+ }
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ this.expandedIds = getExpandedIds();
+ outState.putLongArray("ExpandedIds", this.expandedIds);
+ }
+
+ /*
+ @Override
+ protected void onStart() {
+ super.onStart();
+ if (this.expandedIds != null) {
+ restoreExpandedState(expandedIds);
+ }
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ expandedIds = getExpandedIds();
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ this.expandedIds = getExpandedIds();
+ outState.putLongArray("ExpandedIds", this.expandedIds);
+ }
+
+ @Override
+ protected void onRestoreInstanceState(Bundle state) {
+ super.onRestoreInstanceState(state);
+ long[] expandedIds = state.getLongArray("ExpandedIds");
+ if (expandedIds != null) {
+ restoreExpandedState(expandedIds);
+ }
+ }
+ */
+
+
+ private long[] getExpandedIds() {
+ ExpandableListView list = getExpandableListView();
+ ExpandableListAdapter adapter = getExpandableListAdapter();
+ if (adapter != null) {
+ int length = adapter.getGroupCount();
+ ArrayList