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

Commit de10b425 authored by Ray Chen's avatar Ray Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view"

parents 1de36a55 e6e4beb0

res/menu/movie.xml

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

<!-- Copyright (C) 2010 Google Inc.



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

            android:icon="@drawable/ic_menu_share_holo_light"

            android:title="@string/share"

            android:enabled="true"

            android:actionProviderClass="android.widget.ShareActionProvider"

            android:showAsAction="ifRoom" />

</menu>

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

+25 −3
Original line number Diff line number Diff line
@@ -16,21 +16,24 @@ 


package com.android.gallery3d.app;



import com.android.gallery3d.R;



import android.app.ActionBar;

import android.app.Activity;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.database.Cursor;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Bundle;

import android.provider.MediaStore;

import android.provider.MediaStore.Video.VideoColumns;

import android.view.Menu;

import android.view.MenuItem;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.ShareActionProvider;



import com.android.gallery3d.R;



/**

 * This activity plays a video from a specified URI.
@@ -41,6 +44,7 @@ public class MovieActivity extends Activity { 


    private MoviePlayer mPlayer;

    private boolean mFinishOnCompletion;

    private Uri mUri;



    @Override

    public void onCreate(Bundle savedInstanceState) {
@@ -82,10 +86,11 @@ public class MovieActivity extends Activity { 
        actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP,

                ActionBar.DISPLAY_HOME_AS_UP);

        String title = intent.getStringExtra(Intent.EXTRA_TITLE);

        mUri = intent.getData();

        if (title == null) {

            Cursor cursor = null;

            try {

                cursor = getContentResolver().query(intent.getData(),

                cursor = getContentResolver().query(mUri,

                        new String[] {VideoColumns.TITLE}, null, null, null);

                if (cursor != null && cursor.moveToNext()) {

                    title = cursor.getString(0);
@@ -99,6 +104,23 @@ public class MovieActivity extends Activity { 
        if (title != null) actionBar.setTitle(title);

    }



    @Override

    public boolean onCreateOptionsMenu(Menu menu) {

        super.onCreateOptionsMenu(menu);



        getMenuInflater().inflate(R.menu.movie, menu);

        ShareActionProvider provider = GalleryActionBar.initializeShareActionProvider(menu);



        if (provider != null) {

            Intent intent = new Intent(Intent.ACTION_SEND);

            intent.setType("video/*");

            intent.putExtra(Intent.EXTRA_STREAM, mUri);

            provider.setShareIntent(intent);

        }



        return true;

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {