Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev

Browse Source 
* commit '0c58229306f30e26d4b0ddb3d332def9b7382480':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
This commit is contained in:
Dongwon Kang
2015-07-07 20:27:47 +00:00
committed by Android Git Automerger
parent a572506edc 0c58229306
commit aaac72ac65
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/MediaRouteControllerDialog.java
View File

@@ -18,7 +18,7 @@ package com.android.internal.app;
import com.android.internal.R; import com.android.internal.R;
import android.app.AlertDialog; import android.app.Dialog;
import android.app.MediaRouteActionProvider; import android.app.MediaRouteActionProvider;
import android.app.MediaRouteButton; import android.app.MediaRouteButton;
import android.content.Context; import android.content.Context;
@@ -46,7 +46,7 @@ import android.widget.SeekBar;
* *
* TODO: Move this back into the API, as in the support library media router. * TODO: Move this back into the API, as in the support library media router.
*/ */
public class MediaRouteControllerDialog extends AlertDialog { public class MediaRouteControllerDialog extends Dialog {
// Time to wait before updating the volume when the user lets go of the seek bar // Time to wait before updating the volume when the user lets go of the seek bar
// to allow the route provider time to propagate the change and publish a new // to allow the route provider time to propagate the change and publish a new
// route descriptor. // route descriptor.
@@ -134,6 +134,8 @@ public class MediaRouteControllerDialog extends AlertDialog {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().requestFeature(Window.FEATURE_LEFT_ICON);
setContentView(R.layout.media_route_controller_dialog); setContentView(R.layout.media_route_controller_dialog);
mVolumeLayout = (LinearLayout)findViewById(R.id.media_route_volume_layout); mVolumeLayout = (LinearLayout)findViewById(R.id.media_route_volume_layout);