Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3afe270b authored by Geo Piskas's avatar Geo Piskas
Browse files

Gallery: Removed "Settings" item from menu. (GallerySettings are empty) 

Fixed Build Error from previous patch

Patchset2: Minor comment fix

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93

Conflicts:
	res/menu/albumset.xml
parent dde77bda

res/menu/albumset.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


<!-- Comment out to enable Settings in menu. This should be done when

     GallerySettings.java has content, as it is currently empty.

     Also comment out the settings case at AlbumSetPage.onItemSelected method.



    <item android:id="@+id/action_settings"

            android:title="@string/settings"

src/com/android/gallery3d/app/AlbumSetPage.java

+5 −0
Original line number Diff line number Diff line
@@ -618,10 +618,15 @@ public class AlbumSetPage extends ActivityState implements 
                PicasaSource.requestSync(activity);

                return true;

            }

/*   Comment out to enable Settings in menu. This should be done when

     GallerySettings.java has content, as it is currently empty.

     Also comment out the settings item at albumset.xml menu.



            case R.id.action_settings: {

                activity.startActivity(new Intent(activity, GallerySettings.class));

                return true;

            }

*/

            default:

                return false;

        }