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

Commit cd479379 authored by Joey Rizzoli's avatar Joey Rizzoli Committed by LuK1337
Browse files

Gallery2: Update menu 



Change-Id: I84a09530a44b2a36d6330a2f2a4bb4baf084191e
Signed-off-by: default avatarJoey Rizzoli <joey@cyanogenmoditalia.it>
parent 428d8f93

res/drawable/ic_selection.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="@color/white"

        android:pathData="M3,5 L5,5 L5,3 C3.9,3,3,3.9,3,5 Z M3,13 L5,13 L5,11 L3,11 L3,13 Z M7,21 L9,21

L9,19 L7,19 L7,21 Z M3,9 L5,9 L5,7 L3,7 L3,9 Z M13,3 L11,3 L11,5 L13,5 L13,3 Z

M19,3 L19,5 L21,5 C21,3.9,20.1,3,19,3 Z M5,21 L5,19 L3,19 C3,20.1,3.9,21,5,21 Z

M3,17 L5,17 L5,15 L3,15 L3,17 Z M9,3 L7,3 L7,5 L9,5 L9,3 Z M11,21 L13,21 L13,19

L11,19 L11,21 Z M19,13 L21,13 L21,11 L19,11 L19,13 Z M19,21

C20.1,21,21,20.1,21,19 L19,19 L19,21 Z M19,9 L21,9 L21,7 L19,7 L19,9 Z M19,17

L21,17 L21,15 L19,15 L19,17 Z M15,21 L17,21 L17,19 L15,19 L15,21 Z M15,5 L17,5

L17,3 L15,3 L15,5 Z M7,17 L17,17 L17,7 L7,7 L7,17 Z M9,9 L15,9 L15,15 L9,15 L9,9

Z" />

</vector>

res/menu/album.xml

+10 −14
Original line number Diff line number Diff line
@@ -21,18 +21,14 @@ 
    <item android:id="@+id/action_slideshow"

        android:icon="@drawable/slideshow"

        android:title="@string/slideshow"

            android:showAsAction="never" />

        android:showAsAction="ifRoom" />

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

        android:icon="@drawable/ic_selection"

        android:title="@string/select_item"

            android:showAsAction="never" />

        android:showAsAction="ifRoom" />

<!--     <item android:id="@+id/action_group_by" -->

<!--             android:title="@string/group_by" -->

<!--             android:showAsAction="never"/> -->

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

           android:showAsAction="never"

          />

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

            android:title="@string/sync_picasa_albums"

            android:showAsAction="never"

            android:visible="false" />

       android:showAsAction="never" />

</menu>

res/menu/albumset.xml

+13 −15
Original line number Diff line number Diff line
@@ -22,15 +22,13 @@ 
        android:title="@string/switch_to_camera"

        android:showAsAction="ifRoom" />

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

        android:icon="@drawable/ic_selection"

        android:title="@string/select_album"

        android:showAsAction="never" />

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

            android:title="@string/make_available_offline"

            android:visible="false"

            android:showAsAction="never" />

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

            android:title="@string/sync_picasa_albums"

            android:showAsAction="never" />

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

        android:title="@string/settings"

        android:showAsAction="never" /> -->

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

+0 −1
Original line number Diff line number Diff line
@@ -655,7 +655,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
            menu.findItem(R.id.action_camera).setVisible(

                   GalleryUtils.isAnyCameraAvailable(mActivity));

            menu.findItem(R.id.action_slideshow).setVisible(!mIsVideoScreen);

            menu.findItem(R.id.action_sync_picasa_albums).setVisible(mIsVideoScreen);

            MenuItem item = menu.findItem(R.id.action_view_type);

            updateMenuTitle(item);

            updateMenuTitle(menu.findItem(R.id.action_select));

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

+0 −4
Original line number Diff line number Diff line
@@ -656,10 +656,6 @@ public class AlbumSetPage extends ActivityState implements 
                mActivity.getStateManager().startState(ManageCachePage.class, data);

                return true;

            }

            case R.id.action_sync_picasa_albums: {

                PicasaSource.requestSync(activity);

                return true;

            }

            /*case R.id.action_settings: {

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

                return true;