resolved conflicts for merge of 0657c9ef to eclair-mr2

diff --cc src/com/android/music/MediaPlaybackActivity.java
index d5be5b2,f01b808..69803be
--- 1/src/com/android/music/MediaPlaybackActivity.java
--- 2/src/com/android/music/MediaPlaybackActivity.java
+++ b/src/com/android/music/MediaPlaybackActivity.java
@@@ -536,8 -536,13 +539,12 @@@ public class MediaPlaybackActivity exte
              menu.add(0, PARTY_SHUFFLE, 0, R.string.party_shuffle); // icon will be set in onPrepareOptionsMenu()
              SubMenu sub = menu.addSubMenu(0, ADD_TO_PLAYLIST, 0,
                      R.string.add_to_playlist).setIcon(android.R.drawable.ic_menu_add);
-             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);
 -            MusicUtils.makePlaylistMenu(this, sub);
+             // 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;
@@@ -556,11 -561,8 +563,16 @@@
                  item.setTitle(R.string.party_shuffle);
              }
          }
++
 +        item = menu.findItem(ADD_TO_PLAYLIST);
 +        if (item != null) {
 +            SubMenu sub = item.getSubMenu();
 +            MusicUtils.makePlaylistMenu(this, sub);
 +        }
++
+         KeyguardManager km = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+         menu.setGroupVisible(1, !km.inKeyguardRestrictedInputMode());
++
          return true;
      }