Permalink
Browse files

Merge branch 'master' of github.com:appcelerator/titanium_mobile

  • Loading branch information...
2 parents 7c1d3a4 + f4cc03f commit 9323eb579e21a53b3c34bd068e15f2f92aded433 Blain Hamon committed Nov 12, 2010
@@ -489,7 +489,6 @@ public void filterBy(String text) {
if (adapter != null) {
tiContext.getActivity().runOnUiThread(new Runnable() {
public void run() {
- Log.d(LCAT, "************* weird thing ********");
dataSetChanged();
}
});
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,21 @@
+var IMAGE = "../images/cloud2.png";
+var ACTUAL = "Resources/android/images/medium/cloud2.png";
+
+var win = Titanium.UI.currentWindow;
+
+var imageView = Titanium.UI.createImageView({
+ image:IMAGE
+});
+
+win.add(imageView);
+
+var l = Titanium.UI.createLabel({
+ text:"You should see a cloud image above. It's loaded using the path '" + IMAGE + "' but actually resides in '" + ACTUAL + "'",
+ bottom:30,
+ color:'#999',
+ height:'auto',
+ width:300,
+ textAlign:'center'
+});
+win.add(l);
+
@@ -19,6 +19,9 @@ if (Titanium.Platform.name == 'iPhone OS')
}
data.push({title:'Image Rapid Update', hasChild:true, test:'../examples/image_view_updateimages.js'});
+if (Titanium.Platform.name == 'android') {
+ data.push({title:'Android drawable resource', hasChild:true, test:'image_view_resource.js'});
+}
// create table view
var tableview = Titanium.UI.createTableView({
@@ -109,7 +109,7 @@ def __init__(self, name, sdk, project_dir, support_dir, app_id):
android_creator = Android(name, app_id, self.sdk, None, self.java)
parent_dir = os.path.dirname(self.top_dir)
if os.path.exists(self.top_dir):
- android_creator.create(parent_dir, project_dir=self.top_dir)
+ android_creator.create(parent_dir, project_dir=self.top_dir, build_time=True)
else:
android_creator.create(parent_dir)

0 comments on commit 9323eb5

Please sign in to comment.