Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[TIMOB-10170]update to include Kindle Fire.

  • Loading branch information...
commit 3fa3c0d93bb925e4debcf3f4dcd15fb96ba626bd 1 parent e85b068
@srahim srahim authored
View
70 AndroidManifest/AndroidManifest.xml
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.appcelerator.kitchensinknook" android:versionCode="1"
- android:versionName="1">
- <uses-sdk android:minSdkVersion="8" />
-
- <!-- TI_MANIFEST -->
-
- <application android:icon="@drawable/appicon"
- android:label="KitchenSink-Nook" android:name="KitchensinkNookApplication"
- android:debuggable="false">
-
- <!-- TI_APPLICATION -->
-
- <activity android:name=".KitchensinkNookActivity"
- android:label="KitchenSink-Nook" android:theme="@style/Theme.Titanium"
- android:configChanges="keyboardHidden|orientation">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <activity
- android:name="ti.modules.titanium.media.TiVideoActivity"
- android:configChanges="keyboardHidden|orientation"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:launchMode="singleTask"
- />
-
- <activity
- android:name="ti.modules.titanium.facebook.FBActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar"
- />
-
-
- <activity android:name="org.appcelerator.titanium.TiActivity"
- android:configChanges="keyboardHidden|orientation" />
- <activity android:name="org.appcelerator.titanium.TiTranslucentActivity"
- android:configChanges="keyboardHidden|orientation"
- android:theme="@android:style/Theme.Translucent" />
- <activity android:name="org.appcelerator.titanium.TiModalActivity"
- android:configChanges="keyboardHidden|orientation"
- android:theme="@android:style/Theme.Translucent"
- />
- <activity android:name="ti.modules.titanium.ui.TiTabActivity"
- android:configChanges="keyboardHidden|orientation" />
- <activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity" />
-
- <service android:name="org.appcelerator.titanium.analytics.TiAnalyticsService"
- android:exported="false" />
- <service
- android:name="com.appcelerator.kitchensinknook.TestserviceService"
- />
-
-
- </application>
-
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <!-- <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
- <uses-permission android:name="android.permission.CAMERA"/>
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
- <uses-permission android:name="android.permission.VIBRATE"/>
- <uses-permission android:name="android.permission.READ_CONTACTS"/>
- -->
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
View
87 KindleFire_AndroidManifest/AndroidManifest.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" ?>
+<manifest android:versionCode="1" android:versionName="1"
+ package="com.appcelerator.kitchensink"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <supports-screens android:anyDensity="false"/>
+ <uses-sdk android:minSdkVersion="8"/>
+
+ <!-- TI_MANIFEST -->
+
+ <application android:debuggable="false"
+ android:icon="@drawable/appicon"
+ android:label="KitchenSink"
+ android:name="KitchensinkApplication">
+
+ <activity android:alwaysRetainTaskState="true"
+ android:configChanges="keyboardHidden|orientation"
+ android:label="KitchenSink"
+ android:name=".KitchensinkActivity"
+ android:theme="@style/Theme.Titanium">
+
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+
+ <activity
+ android:configChanges="keyboardHidden|orientation"
+ android:launchMode="singleTask"
+ android:name="ti.modules.titanium.media.TiVideoActivity"
+ ndroid:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
+
+ <activity
+ android:name="ti.modules.titanium.facebook.FBActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+
+ <activity
+ android:configChanges="keyboardHidden|orientation"
+ android:name="ti.modules.titanium.media.TiCameraActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"/>
+
+ <activity
+ android:configChanges="keyboardHidden|orientation"
+ android:name="org.appcelerator.titanium.TiActivity"/>
+
+ <activity
+ android:configChanges="keyboardHidden|orientation"
+ android:name="org.appcelerator.titanium.TiTranslucentActivity"
+ android:theme="@android:style/Theme.Translucent"/>
+
+ <activity
+ android:configChanges="keyboardHidden|orientation"
+ android:name="org.appcelerator.titanium.TiModalActivity"
+ android:theme="@android:style/Theme.Translucent"/>
+
+ <activity
+ android:configChanges="keyboardHidden|orientation"
+ android:name="ti.modules.titanium.ui.TiTabActivity"/>
+
+ <activity
+ android:name="ti.modules.titanium.ui.android.TiPreferencesActivity"/>
+
+ <service
+ android:exported="false"
+ android:name="org.appcelerator.titanium.analytics.TiAnalyticsService"/>
+
+ <service
+ android:name="com.appcelerator.kitchensink.TestserviceService"/>
+
+
+ </application>
+
+
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <!--<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"/>-->
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+
+
+</manifest>
View
1  KindleFire_AndroidManifest/README.txt
@@ -0,0 +1 @@
+To run KitchenSink on Kindle Fire, Copy the `AndroidManifest.xml` found in this same folder to `platform/android`.
View
2  README
@@ -1,6 +1,6 @@
Welcome to your Appcelerator Titanium Mobile Project
-This is tabbed application, consisting of multiple stacks of windows associated with tabs in a tab group. A starting point for tab-based application with multiple top-level windows. Requires Titanium Mobile SDK 1.8.0+.
+This is tabbed application, consisting of multiple stacks of windows associated with tabs in a tab group. A starting point for tab-based application with multiple top-level windows. Requires Titanium Mobile SDK 2.1.0+.
----------------------------------
Stuff our legal folk make us say:
View
4 Resources/ui/common/PhoneWindow.js
@@ -10,7 +10,7 @@ function PhoneWindow(title) {
var data = [
{title:'Play Movie', hasChild:true, test:'ui/common/phone/movie'}
];
- if (self.model != 'Kindle Fire') {
+ if (Ti.Platform.model != 'Kindle Fire') {
data.push({title:'Vibrate', hasChild:true, test:'ui/common/phone/vibrate'});
data.push({title:'Geolocation', hasChild:true, test:'ui/common/phone/geolocation'});
data.push({title:'Accelerometer', hasChild:true, test:'ui/common/phone/accelerometer'});
@@ -23,7 +23,7 @@ function PhoneWindow(title) {
//Donot include camera if it is iPad 1st gen.
- if (Titanium.Platform.model !== 'iPad1,1' || self.model != 'Kindle Fire') {
+ if ((Titanium.Platform.model !== 'iPad1,1') && ( Ti.Platform.model != 'Kindle Fire')) {
data.push({title:'Camera', hasChild:!isMobileWeb, test:'ui/common/phone/camera', touchEnabled:!isMobileWeb, color:isMobileWeb?"#aaa":"#000"});
}
View
5 Resources/ui/common/phone/vibrate.js
@@ -19,7 +19,10 @@ function vibrate() {
b1.addEventListener('click', function()
{
- Titanium.Media.vibrate();
+ if(Ti.Platform.model != 'Kindle Fire'){
+ Titanium.Media.vibrate();
+ }
+
});
return win;
};
Please sign in to comment.
Something went wrong with that request. Please try again.