From d7a4663db846a4d0812f43c971cb261dde4648d4 Mon Sep 17 00:00:00 2001 From: Mad Beggar Date: Wed, 16 Apr 2014 02:26:38 -0400 Subject: [PATCH 1/2] Updated for XE16 Changed Timecard API calls for match GDK 19 Moved openOptionsMenu to onAttachedToWindow --- .../android/glass/glasslauncher/MainActivity.java | 2 +- .../android/glass/glasslauncher/MenuActivity.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/jtxdriggers/android/glass/glasslauncher/MainActivity.java b/src/com/jtxdriggers/android/glass/glasslauncher/MainActivity.java index f1ab5b2..8ca4c54 100644 --- a/src/com/jtxdriggers/android/glass/glasslauncher/MainActivity.java +++ b/src/com/jtxdriggers/android/glass/glasslauncher/MainActivity.java @@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) { card.setText("Welcome! You can now select Glass Launcher to the left of the time card. You can close this screen at any time."); card.setFootnote(R.string.app_name); - setContentView(card.toView()); + setContentView(card.getView()); startService(new Intent(this, GlassLauncherService.class)); } diff --git a/src/com/jtxdriggers/android/glass/glasslauncher/MenuActivity.java b/src/com/jtxdriggers/android/glass/glasslauncher/MenuActivity.java index 3501a2d..63aca99 100644 --- a/src/com/jtxdriggers/android/glass/glasslauncher/MenuActivity.java +++ b/src/com/jtxdriggers/android/glass/glasslauncher/MenuActivity.java @@ -48,7 +48,14 @@ protected void onCreate(Bundle savedInstanceState) { public void onResume() { super.onResume(); + //openOptionsMenu(); + } + + @Override + public void onAttachedToWindow() + { openOptionsMenu(); + } @Override From b8bb9dbd8cbb7215be16e0c37d6331e5f1a611f3 Mon Sep 17 00:00:00 2001 From: Mad Beggar Date: Wed, 16 Apr 2014 02:29:51 -0400 Subject: [PATCH 2/2] Updated for XE16 Changed Timeline api calls to GDK19 --- .../android/glass/glasslauncher/GlassLauncherService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/jtxdriggers/android/glass/glasslauncher/GlassLauncherService.java b/src/com/jtxdriggers/android/glass/glasslauncher/GlassLauncherService.java index 4ee2fc7..c389b31 100644 --- a/src/com/jtxdriggers/android/glass/glasslauncher/GlassLauncherService.java +++ b/src/com/jtxdriggers/android/glass/glasslauncher/GlassLauncherService.java @@ -23,7 +23,7 @@ import com.google.android.glass.timeline.LiveCard; import com.google.android.glass.timeline.LiveCard.PublishMode; -import com.google.android.glass.timeline.TimelineManager; +import com.google.android.glass.timeline.*; import android.app.PendingIntent; import android.app.Service; @@ -148,8 +148,7 @@ public void onReceive(Context context, Intent intent) { private void publishCard(Context context) { if (mLiveCard == null) { String cardId = "glass_launcher"; - TimelineManager tm = TimelineManager.from(context); - mLiveCard = tm.createLiveCard(cardId); + mLiveCard = new LiveCard(context, cardId); mLiveCard.setViews(new RemoteViews(context.getPackageName(), R.layout.glasslauncher_layout));