summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-03-11 15:08:26 -0700
committerJohn Hoford <hoford@google.com>2013-03-11 15:32:03 -0700
commitf0765f183c87fc5ab47f5a05193a06f8fc95757e (patch)
tree24b3a1b606e020600ddfccbc66b96efb6d7fd8d2 /src
parent887bde65742747aea7ab6dcf7c300ca8ec1f1ebf (diff)
downloadandroid_packages_apps_Snap-f0765f183c87fc5ab47f5a05193a06f8fc95757e.tar.gz
android_packages_apps_Snap-f0765f183c87fc5ab47f5a05193a06f8fc95757e.tar.bz2
android_packages_apps_Snap-f0765f183c87fc5ab47f5a05193a06f8fc95757e.zip
split filter show into multiple files
Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 37115a5f7..1c1a2bc03 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -162,6 +162,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
private void loadXML() {
setContentView(R.layout.filtershow_activity);
+ ((ViewStub) findViewById(R.id.stateCategoryStub)).inflate();
+ ((ViewStub) findViewById(R.id.editorPanelStub)).inflate();
+ ((ViewStub) findViewById(R.id.historyPanelStub)).inflate();
+ ((ViewStub) findViewById(R.id.statePanelStub)).inflate();
+
ActionBar actionBar = getActionBar();
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
actionBar.setCustomView(R.layout.filtershow_actionbar);
@@ -206,8 +211,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
mPanelController.addView(findViewById(R.id.applyEffect));
- ((ViewStub) findViewById(R.id.historyPanelStub)).inflate();
- ((ViewStub) findViewById(R.id.statePanelStub)).inflate();
setupHistoryPanel();
setupStatePanel();
}