to it we want it back in its initial state. We exclude from
recents since this is accessible through a notification when
appropriate. -->
- <activity android:name="com.android.music.MediaPlaybackActivityStarter"
+ <activity android:name="com.android.music.MediaPlaybackActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:label="@string/mediaplaybacklabel"
android:taskAffinity=""
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="com.android.music.MediaPlaybackActivity"
- android:theme="@android:style/Theme.NoTitleBar"
- android:label="@string/mediaplaybacklabel" >
- </activity>
<activity android:name="com.android.music.StreamStarter"
android:theme="@android:style/Theme.Dialog" >
* Link up various button actions using {@link PendingIntents}.
*
* @param playerActive True if player is active in background, which means
- * widget click will launch {@link MediaPlaybackActivityStarter},
+ * widget click will launch {@link MediaPlaybackActivity},
* otherwise we launch {@link MusicBrowserActivity}.
*/
private void linkButtons(Context context, RemoteViews views, boolean playerActive) {
final ComponentName serviceName = new ComponentName(context, MediaPlaybackService.class);
if (playerActive) {
- intent = new Intent(context, MediaPlaybackActivityStarter.class);
+ intent = new Intent(context, MediaPlaybackActivity.class);
pendingIntent = PendingIntent.getActivity(context,
0 /* no requestCode */, intent, 0 /* no flags */);
views.setOnClickPendingIntent(R.id.album_appwidget, pendingIntent);
+++ /dev/null
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.music;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-public class MediaPlaybackActivityStarter extends Activity
-{
- public MediaPlaybackActivityStarter()
- {
- }
-
- @Override
- public void onCreate(Bundle icicle)
- {
- super.onCreate(icicle);
- Intent i = new Intent(getIntent());
- i.setClass(this, MediaPlaybackActivity.class);
- startActivity(i);
- finish();
- }
-
-
-}
-
sService.play();
} catch (RemoteException ex) {
} finally {
- Intent intent = new Intent(context, MediaPlaybackActivity.class)
+ Intent intent = new Intent("com.android.music.PLAYBACK_VIEWER")
.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
context.startActivity(intent);
}
}
final TabWidget ll = (TabWidget) a.findViewById(R.id.buttonbar);
- ll.setCurrentTab((Integer) v.getTag());
activateTab(a, id);
if (id != R.id.nowplayingtab) {
+ ll.setCurrentTab((Integer) v.getTag());
setIntPref(a, "activetab", id);
}
}