hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an unneeded FrameLayout in the ExpandableListFragment layout.

Browse Source
This commit is contained in:
Kevin Ruland 2012-02-10 02:28:54 +00:00
parent 62d58398ce
commit 40c6999bb0
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/src/net/sf/openrocket/android/util/ExpandableListFragment.java
View File

@ -36,7 +36,6 @@ ExpandableListView.OnGroupCollapseListener, ExpandableListView.OnGroupExpandList
{ {
static final int INTERNAL_EMPTY_ID = 0x00ff0001; static final int INTERNAL_EMPTY_ID = 0x00ff0001;
static final int INTERNAL_LIST_CONTAINER_ID = 0x00ff0003;
final private Handler mHandler = new Handler(); final private Handler mHandler = new Handler();
@ -82,13 +81,10 @@ ExpandableListView.OnGroupCollapseListener, ExpandableListView.OnGroupExpandList
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
FrameLayout root = new FrameLayout(getActivity()); FrameLayout root = new FrameLayout(getActivity());
FrameLayout lframe = new FrameLayout(getActivity());
lframe.setId(INTERNAL_LIST_CONTAINER_ID);
TextView tv = new TextView(getActivity()); TextView tv = new TextView(getActivity());
tv.setId(INTERNAL_EMPTY_ID); tv.setId(INTERNAL_EMPTY_ID);
tv.setGravity(Gravity.CENTER); tv.setGravity(Gravity.CENTER);
lframe.addView(tv, root.addView(tv,
new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT));
ExpandableListView lv = new ExpandableListView(getActivity()); ExpandableListView lv = new ExpandableListView(getActivity());
@ -98,10 +94,7 @@ ExpandableListView.OnGroupCollapseListener, ExpandableListView.OnGroupExpandList
lv.setOnGroupExpandListener(this); lv.setOnGroupExpandListener(this);
lv.setOnGroupCollapseListener(this); lv.setOnGroupCollapseListener(this);
lframe.addView(lv, root.addView(lv, new FrameLayout.LayoutParams(
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)); ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT));
ListView.LayoutParams lp = ListView.LayoutParams lp =
@ -272,7 +265,7 @@ ExpandableListView.OnGroupCollapseListener, ExpandableListView.OnGroupExpandList
if (mStandardEmptyView == null) { if (mStandardEmptyView == null) {
mEmptyView = root.findViewById(android.R.id.empty); mEmptyView = root.findViewById(android.R.id.empty);
} }
mListContainer = root.findViewById(INTERNAL_LIST_CONTAINER_ID); mListContainer = root.findViewById(android.R.id.list);
View rawListView = root.findViewById(android.R.id.list); View rawListView = root.findViewById(android.R.id.list);
if (!(rawListView instanceof ExpandableListView)) { if (!(rawListView instanceof ExpandableListView)) {
if (rawListView == null) { if (rawListView == null) {