fergalmoran/chrometophone
1
0
Fork 0
mirror of https://github.com/fergalmoran/chrometophone.git synced 2025-12-22 09:41:51 +00:00
Code Issues 265 Packages Projects Releases Wiki Activity

Preliminary phone<->tablet support

Browse Source
This commit is contained in:
burke.davey
2011-02-12 21:40:24 +00:00
parent 3e73e0b03d
commit e63c803a1d
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@@ -39,7 +39,6 @@
android:screenOrientation="portrait"> android:screenOrientation="portrait">
</activity> </activity>
<!--
<activity android:name=".ShareLinkActivity"> <activity android:name=".ShareLinkActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
@@ -47,7 +46,6 @@
<data android:mimeType="text/plain" /> <data android:mimeType="text/plain" />
</intent-filter> </intent-filter>
</activity> </activity>
-->
<!-- In order to use the c2dm library, an <!-- In order to use the c2dm library, an
application must declare a class with the name C2DMReceiver, in its application must declare a class with the name C2DMReceiver, in its

7
android/src/com/google/android/apps/chrometophone/C2DMReceiver.java
View File

@@ -21,6 +21,7 @@ import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@@ -85,8 +86,12 @@ public class C2DMReceiver extends C2DMBaseReceiver {
// Notify and optionally start activity // Notify and optionally start activity
if (settings.getBoolean("launchBrowserOrMaps", true) && launchIntent != null) { if (settings.getBoolean("launchBrowserOrMaps", true) && launchIntent != null) {
LauncherUtils.playNotificationSound(context); try {
context.startActivity(launchIntent); context.startActivity(launchIntent);
LauncherUtils.playNotificationSound(context);
} catch (ActivityNotFoundException e) {
return;
}
} else { } else {
if (sel != null && sel.length() > 0) { // have selection if (sel != null && sel.length() > 0) { // have selection
LauncherUtils.generateNotification(context, sel, LauncherUtils.generateNotification(context, sel,

14
android/src/com/google/android/apps/chrometophone/DeviceRegistrar.java
View File

@@ -26,7 +26,9 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.provider.Settings.Secure; import android.provider.Settings.Secure;
import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.WindowManager;
/** /**
* Register/unregister with the Chrome to Phone App Engine server. * Register/unregister with the Chrome to Phone App Engine server.
@@ -118,7 +120,19 @@ public class DeviceRegistrar {
params.add(new BasicNameValuePair("deviceId", deviceId)); params.add(new BasicNameValuePair("deviceId", deviceId));
} }
// TODO: Allow device name to be configured
params.add(new BasicNameValuePair("deviceName", isTablet(context) ? "Tablet" : "Phone"));
AppEngineClient client = new AppEngineClient(context, accountName); AppEngineClient client = new AppEngineClient(context, accountName);
return client.makeRequest(urlPath, params); return client.makeRequest(urlPath, params);
} }
static boolean isTablet (Context context) {
// Look for a width/height >= 7 inches (which is min xlarge width)
// TODO: Remove this hack once we allow user to specify device name
WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics metrics = new DisplayMetrics();
wm.getDefaultDisplay().getMetrics(metrics);
return (metrics.widthPixels / metrics.xdpi >= 7 || metrics.heightPixels / metrics.ydpi >= 7);
}
} }

7
android/src/com/google/android/apps/chrometophone/ShareLink.java
View File

@@ -16,7 +16,6 @@
package com.google.android.apps.chrometophone; package com.google.android.apps.chrometophone;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -56,8 +55,10 @@ public class ShareLink implements Handler.Callback {
sendToast(mContext.getString(R.string.sending_link_toast)); sendToast(mContext.getString(R.string.sending_link_toast));
try { try {
List<NameValuePair> params = new ArrayList<NameValuePair>(); List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new BasicNameValuePair("url", URLEncoder.encode(link))); params.add(new BasicNameValuePair("url", link));
params.add(new BasicNameValuePair("deviceType", "chrome")); params.add(new BasicNameValuePair("deviceName", "Chrome," +
(DeviceRegistrar.isTablet(mContext) ? "Phone" : "Tablet")));
SharedPreferences settings = Prefs.get(mContext); SharedPreferences settings = Prefs.get(mContext);
final String accountName = settings.getString("accountName", null); final String accountName = settings.getString("accountName", null);