diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2012-09-26 14:20:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 16:33:07 -0700 |
commit | 71111a19a258ded2c9e899d0e4632ea283c8ae8d (patch) | |
tree | 9f812911d1fb626f2e08d497a7f9d6d9c8173b81 /src/com/android/gallery3d/app/TrimVideo.java | |
parent | ff0dba310d010dc19ee6968bc6a9ac7fc3615cbc (diff) | |
download | android_packages_apps_Snap-71111a19a258ded2c9e899d0e4632ea283c8ae8d.tar.gz android_packages_apps_Snap-71111a19a258ded2c9e899d0e4632ea283c8ae8d.tar.bz2 android_packages_apps_Snap-71111a19a258ded2c9e899d0e4632ea283c8ae8d.zip |
Trimming: switch to use sherlock action bar
Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.
bug:7093240
Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
Diffstat (limited to 'src/com/android/gallery3d/app/TrimVideo.java')
-rw-r--r-- | src/com/android/gallery3d/app/TrimVideo.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java index f7ff43e96..1018ef691 100644 --- a/src/com/android/gallery3d/app/TrimVideo.java +++ b/src/com/android/gallery3d/app/TrimVideo.java @@ -16,8 +16,6 @@ package com.android.gallery3d.app; -import android.app.ActionBar; -import android.app.Activity; import android.app.ProgressDialog; import android.content.ContentResolver; import android.content.ContentValues; @@ -31,14 +29,17 @@ import android.os.Environment; import android.os.Handler; import android.provider.MediaStore.Video; import android.provider.MediaStore.Video.VideoColumns; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; import android.widget.VideoView; +import com.actionbarsherlock.app.ActionBar; +import com.actionbarsherlock.app.SherlockActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuInflater; +import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.Window; import com.android.gallery3d.R; import com.android.gallery3d.util.BucketNames; @@ -47,7 +48,7 @@ import java.io.IOException; import java.sql.Date; import java.text.SimpleDateFormat; -public class TrimVideo extends Activity implements +public class TrimVideo extends SherlockActivity implements MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener, ControllerOverlay.Listener { @@ -83,8 +84,13 @@ public class TrimVideo extends Activity implements mContext = getApplicationContext(); super.onCreate(savedInstanceState); - ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); + requestWindowFeature(Window.FEATURE_ACTION_BAR); + requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); + + ActionBar actionBar = getSupportActionBar(); + int displayOptions = ActionBar.DISPLAY_HOME_AS_UP + | ActionBar.DISPLAY_SHOW_TITLE; + actionBar.setDisplayOptions(displayOptions, displayOptions); Intent intent = getIntent(); mUri = intent.getData(); @@ -209,7 +215,7 @@ public class TrimVideo extends Activity implements @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - MenuInflater inflater = getMenuInflater(); + MenuInflater inflater = getSupportMenuInflater(); inflater.inflate(R.menu.trim, menu); return true; }; |