Skip to content

Commit

Permalink
timob-17211: Layout test is not valid for android any more because th…
Browse files Browse the repository at this point in the history
…ere is no lightweight windows since 3.3.0
  • Loading branch information
pingwang2011 committed Jun 30, 2014
1 parent ad4b8ea commit f436108
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
12 changes: 5 additions & 7 deletions Resources/ui/common/baseui/window_properties.js
Expand Up @@ -110,12 +110,6 @@ function win_props(_args) {
var win2 = null;
buttonLayout.addEventListener('click', function()
{
if(Ti.Platform.osname == 'blackberry') {
Ti.BlackBerry.createToastNotification({
message: 'Test invalid for BlackBerry'
}).show();
return;
}
if (layout)
{
win1 = Titanium.UI.createWindow({
Expand Down Expand Up @@ -154,7 +148,11 @@ function win_props(_args) {
layout=true;
}
});
win.add(buttonLayout);
// Layout test is not valid for BlackBerry or Android
var osname = Ti.Platform.osname;
if (osname != 'blackberry' && osname != 'android') {
win.add(buttonLayout);
}

//
// TOGGLE BORDER PROPERTIES
Expand Down
5 changes: 2 additions & 3 deletions tiapp.xml
Expand Up @@ -8,9 +8,8 @@
<target device="android">true</target>
<target device="blackberry">true</target>
</deployment-targets>
<property name="ti.android.useLegacyWindow" type="bool">true</property>
<property name="ti.ui.defaultunit" type="string">dp</property>
<sdk-version>3.3.0.GA</sdk-version>
<sdk-version>3.4.0</sdk-version>
<id>com.appcelerator.kitchensink</id>
<name>KitchenSink</name>
<version>3.3.0</version>
Expand Down Expand Up @@ -77,7 +76,7 @@
<permission>run_when_backgrounded</permission>
<permission>access_sms_mms</permission>
</permissions>
</blackberry>
</blackberry>
<tizen appid="nmgg3ski3z" xmlns:tizen="http://ti.appcelerator.org">
<tizen:privilege name="http://tizen.org/privilege/alarm"/>
<tizen:privilege name="http://tizen.org/privilege/application.launch"/>
Expand Down

0 comments on commit f436108

Please sign in to comment.