diff options
author | John Reck <jreck@google.com> | 2012-12-12 13:43:43 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2012-12-12 13:43:43 -0800 |
commit | ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106 (patch) | |
tree | 5ee8e298937a49690099c78f561dabbbc9af5549 /src/com/android/gallery3d/app/ActivityState.java | |
parent | 8e8cc05541f6c8c34c6c37aa5622e146064a1793 (diff) | |
download | android_packages_apps_Snap-ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106.tar.gz android_packages_apps_Snap-ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106.tar.bz2 android_packages_apps_Snap-ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106.zip |
remove actionbar sherlock
Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index fa5a9bd54..2f1e0c9d9 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -16,6 +16,7 @@ package com.android.gallery3d.app; +import android.app.ActionBar; import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,14 +26,12 @@ import android.content.res.Configuration; import android.os.BatteryManager; import android.os.Bundle; import android.view.HapticFeedbackConstants; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.Window; import android.view.WindowManager; -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.android.gallery3d.R; import com.android.gallery3d.anim.StateTransitionAnimation; import com.android.gallery3d.glrenderer.RawTexture; @@ -198,7 +197,7 @@ abstract public class ActivityState { // should only be called by StateManager void resume() { AbstractGalleryActivity activity = mActivity; - ActionBar actionBar = ((SherlockActivity) activity).getSupportActionBar(); + ActionBar actionBar = activity.getActionBar(); if (actionBar != null) { if ((mFlags & FLAG_HIDE_ACTION_BAR) != 0) { actionBar.hide(); @@ -272,6 +271,6 @@ abstract public class ActivityState { } protected MenuInflater getSupportMenuInflater() { - return ((SherlockActivity) mActivity).getSupportMenuInflater(); + return mActivity.getMenuInflater(); } } |