Merge pull request #4728 from Akylas/TC-2494

[TIMOB-14399] scrollableview should call setActivity on its children (second try)
tidev · Sep 30, 2013 · a614d03 · a614d03
2 parents a68d1d1 + b395f4f
commit a614d03
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollableViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/ScrollableViewProxy.java
@@ -289,4 +289,14 @@ public void releaseViews()
 		getMainHandler().removeMessages(MSG_HIDE_PAGER);
 		super.releaseViews();
 	}
+
+	@Override
+	public void setActivity(Activity activity)
+	{
+		super.setActivity(activity);
+		ArrayList<TiViewProxy> list = getView().getViews();
+		for (TiViewProxy proxy : list) {
+			proxy.setActivity(activity);
+		}
+	}
 }
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollableView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollableView.java
@@ -320,6 +320,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue,
 	public void addView(TiViewProxy proxy)
 	{
 		if (!mViews.contains(proxy)) {
+			proxy.setActivity(this.proxy.getActivity());
 			mViews.add(proxy);
 			getProxy().setProperty(TiC.PROPERTY_VIEWS, mViews.toArray());
 			mAdapter.notifyDataSetChanged();
@@ -424,9 +425,11 @@ public void setViews(Object viewsObject)
 
 		if (viewsObject instanceof Object[]) {
 			Object[] views = (Object[])viewsObject;
+			Activity activity = this.proxy.getActivity();
 			for (int i = 0; i < views.length; i++) {
 				if (views[i] instanceof TiViewProxy) {
 					TiViewProxy tv = (TiViewProxy)views[i];
+					tv.setActivity(activity);
 					mViews.add(tv);
 					changed = true;
 				}