diff options
author | Owen Lin <owenlin@google.com> | 2012-10-02 15:27:00 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2012-10-02 17:07:20 +0800 |
commit | 665d2d9a47908c33472e9eda065cdbf13ff0cefa (patch) | |
tree | 5c4a4de9d269c72266441e822e06a598e473150b /src/com/android/gallery3d/app/ActivityState.java | |
parent | 74e0682463c79b475be0b0dfc9a789921b4e31f1 (diff) | |
download | android_packages_apps_Snap-665d2d9a47908c33472e9eda065cdbf13ff0cefa.tar.gz android_packages_apps_Snap-665d2d9a47908c33472e9eda065cdbf13ff0cefa.tar.bz2 android_packages_apps_Snap-665d2d9a47908c33472e9eda065cdbf13ff0cefa.zip |
Remove ActionBarSherlock
bug: 7242682
Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
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 2eb480a20..75327e477 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.ContentResolver; @@ -27,14 +28,12 @@ import android.os.BatteryManager; import android.os.Bundle; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; +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.ui.GLView; import com.android.gallery3d.util.GalleryUtils; @@ -167,7 +166,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(); @@ -240,6 +239,6 @@ abstract public class ActivityState { } protected MenuInflater getSupportMenuInflater() { - return ((SherlockActivity) mActivity).getSupportMenuInflater(); + return mActivity.getMenuInflater(); } } |