Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to XE16 #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to XE16 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7a4663
Updated for XE16
ggiraudon Apr 16, 2014
b8bb9db
Updated for XE16
ggiraudon Apr 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/com/jtxdriggers/android/glass/glasslauncher/GlassLauncherService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/com/jtxdriggers/android/glass/glasslauncher/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
7 changes: 7 additions & 0 deletions src/com/jtxdriggers/android/glass/glasslauncher/MenuActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@ protected void onCreate(Bundle savedInstanceState) {
public void onResume() {
super.onResume();

//openOptionsMenu();
}

@Override
public void onAttachedToWindow()
{
openOptionsMenu();

}

@Override
Expand Down