Feature 2179737: allow the "now playing" activity to show without unlocking the phone.
Bring back this change now that the bugs are fixed.
This reverts commit 2f70aeeb516899a276a55432b02d989304e93a08.
diff --git a/src/com/android/music/MediaPlaybackActivity.java b/src/com/android/music/MediaPlaybackActivity.java
index 8688fbb..f01b808 100644
--- a/src/com/android/music/MediaPlaybackActivity.java
+++ b/src/com/android/music/MediaPlaybackActivity.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.app.AlertDialog;
+import android.app.KeyguardManager;
import android.app.SearchManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -54,6 +55,7 @@
import android.view.View;
import android.view.ViewConfiguration;
import android.view.Window;
+import android.view.WindowManager;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ProgressBar;
@@ -100,6 +102,7 @@
mAlbumArtHandler = new AlbumArtHandler(mAlbumArtWorker.getLooper());
requestWindowFeature(Window.FEATURE_NO_TITLE);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
setContentView(R.layout.audio_player);
mCurrentTime = (TextView) findViewById(R.id.currenttime);
@@ -534,8 +537,12 @@
SubMenu sub = menu.addSubMenu(0, ADD_TO_PLAYLIST, 0,
R.string.add_to_playlist).setIcon(android.R.drawable.ic_menu_add);
MusicUtils.makePlaylistMenu(this, sub);
- menu.add(0, USE_AS_RINGTONE, 0, R.string.ringtone_menu_short).setIcon(R.drawable.ic_menu_set_as_ringtone);
- menu.add(0, DELETE_ITEM, 0, R.string.delete_item).setIcon(R.drawable.ic_menu_delete);
+ // these next two are in a separate group, so they can be shown/hidden as needed
+ // based on the keyguard state
+ menu.add(1, USE_AS_RINGTONE, 0, R.string.ringtone_menu_short)
+ .setIcon(R.drawable.ic_menu_set_as_ringtone);
+ menu.add(1, DELETE_ITEM, 0, R.string.delete_item)
+ .setIcon(R.drawable.ic_menu_delete);
return true;
}
return false;
@@ -554,6 +561,8 @@
item.setTitle(R.string.party_shuffle);
}
}
+ KeyguardManager km = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+ menu.setGroupVisible(1, !km.inKeyguardRestrictedInputMode());
return true;
}