Fixed a bug with the options menu

Viddi · Apr 19, 2014 · 66598f8 · 66598f8
1 parent a72a2a7
commit 66598f8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 22 deletions.
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="com.google.android.glass.permission.DEVELOPMENT"/>
 
     <application
             android:allowBackup="true"

diff --git a/main/src/main/java/is/vidarottosson/glass/gallery/DetailsActivity.java b/main/src/main/java/is/vidarottosson/glass/gallery/DetailsActivity.java
@@ -18,6 +18,7 @@ public class DetailsActivity extends Activity {
     public static final String TAG = DetailsActivity.class.getSimpleName();
 
     public static final String KEY_INTENT_EXTRA_PATH = "filePath";
+    public static final int INTENT_DETAILS = 400;
 
     private TextView mTxtTitle, mTxtTime, mTxtSize, mTxtPath;
 

diff --git a/main/src/main/java/is/vidarottosson/glass/gallery/MenuActivity.java b/main/src/main/java/is/vidarottosson/glass/gallery/MenuActivity.java
@@ -25,11 +25,11 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 	}
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-		openOptionsMenu();
-	}
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        openOptionsMenu();
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -67,6 +67,7 @@ public void onOptionsMenuClosed(Menu menu) {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        openOptionsMenu();
 		if (resultCode == RESULT_OK && requestCode == INTENT_PICTURES) {
 
 		}

diff --git a/main/src/main/java/is/vidarottosson/glass/gallery/ShareMenuActivity.java b/main/src/main/java/is/vidarottosson/glass/gallery/ShareMenuActivity.java
@@ -18,11 +18,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
 	}
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-		openOptionsMenu();
-	}
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        openOptionsMenu();
+    }
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {

diff --git a/main/src/main/java/is/vidarottosson/glass/gallery/picture/PictureMenuActivity.java b/main/src/main/java/is/vidarottosson/glass/gallery/picture/PictureMenuActivity.java
@@ -19,7 +19,7 @@
 public class PictureMenuActivity extends Activity {
 
     public static final String TAG = PictureMenuActivity.class.getSimpleName();
-    
+
     public static final String KEY_INTENT_EXTRA_PICTURE = "pictureItem";
 
     private FileItem mFileItem;
@@ -39,8 +39,8 @@ else if(bundle.getParcelable(VideoItem.KEY_FOR_INTENT_EXTRA) != null) {
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
         openOptionsMenu();
     }
 
@@ -63,7 +63,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.details:
                 Intent detailsIntent = new Intent(this, DetailsActivity.class);
                 detailsIntent.putExtra(DetailsActivity.KEY_INTENT_EXTRA_PATH, mFileItem.getPath());
-                startActivity(detailsIntent);
+                startActivityForResult(detailsIntent, DetailsActivity.INTENT_DETAILS);
                 isWaiting = true;
                 return true;
             case R.id.delete:
@@ -88,6 +88,8 @@ public void onOptionsMenuClosed(Menu menu) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+        openOptionsMenu();
+
         if(requestCode == DeleteActivity.INTENT_DELETE && resultCode == RESULT_OK) {
             setResult(DeleteActivity.RESULT_DELETED);
             finish();

diff --git a/main/src/main/java/is/vidarottosson/glass/gallery/video/VideoMenuActivity.java b/main/src/main/java/is/vidarottosson/glass/gallery/video/VideoMenuActivity.java
@@ -29,11 +29,11 @@ protected void onCreate(Bundle savedInstanceState) {
 		}
 	}
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-		openOptionsMenu();
-	}
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        openOptionsMenu();
+    }
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
@@ -53,7 +53,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			case R.id.details:
 				Intent detailsIntent = new Intent(this, DetailsActivity.class);
 				detailsIntent.putExtra(DetailsActivity.KEY_INTENT_EXTRA_PATH, mVideo.getPath());
-				startActivity(detailsIntent);
+				startActivityForResult(detailsIntent, DetailsActivity.INTENT_DETAILS);
 				mIsWaiting = true;
 				return true;
 			case R.id.delete:
@@ -78,6 +78,8 @@ public void onOptionsMenuClosed(Menu menu) {
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
+        openOptionsMenu();
+
 		if (requestCode == DeleteActivity.INTENT_DELETE && resultCode == RESULT_OK) {
 			setResult(DeleteActivity.RESULT_DELETED);
 			finish();

diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
     <string name="app_name">Gallery</string>
     <string name="gallery_pictures">Pictures</string>
     <string name="gallery_videos">Videos</string>
-    <string name="trigger_gallery">gallery</string>
     <string name="error_picture">Failed to load image</string>
     <string name="share">Share with..</string>
     <string name="details">Details</string>

diff --git a/main/src/main/res/xml/gallery_trigger.xml b/main/src/main/res/xml/gallery_trigger.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<trigger keyword="@string/trigger_gallery"/>
+<trigger command="CHECK_ME_IN"/>