diff options
author | Jae Seo <jaeseo@google.com> | 2015-06-29 17:14:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 17:14:43 +0000 |
commit | 82b3f67711246ad5beaf7702ce16e9d433406d1e (patch) | |
tree | 20482b421e53138a2c4588016223dc569f9c7c14 | |
parent | 6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa (diff) | |
parent | 001d51496d062789355a91ce9365cd0cfeac6925 (diff) | |
download | frameworks_base-82b3f67711246ad5beaf7702ce16e9d433406d1e.zip frameworks_base-82b3f67711246ad5beaf7702ce16e9d433406d1e.tar.gz frameworks_base-82b3f67711246ad5beaf7702ce16e9d433406d1e.tar.bz2 |
Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
-rw-r--r-- | core/java/com/android/internal/app/MediaRouteControllerDialog.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/com/android/internal/app/MediaRouteControllerDialog.java b/core/java/com/android/internal/app/MediaRouteControllerDialog.java index b0e0373..4a468be 100644 --- a/core/java/com/android/internal/app/MediaRouteControllerDialog.java +++ b/core/java/com/android/internal/app/MediaRouteControllerDialog.java @@ -18,7 +18,7 @@ package com.android.internal.app; import com.android.internal.R; -import android.app.Dialog; +import android.app.AlertDialog; import android.app.MediaRouteActionProvider; import android.app.MediaRouteButton; 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. */ -public class MediaRouteControllerDialog extends Dialog { +public class MediaRouteControllerDialog extends AlertDialog { // 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 // route descriptor. @@ -134,8 +134,6 @@ public class MediaRouteControllerDialog extends Dialog { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getWindow().requestFeature(Window.FEATURE_LEFT_ICON); - setContentView(R.layout.media_route_controller_dialog); mVolumeLayout = (LinearLayout)findViewById(R.id.media_route_volume_layout); |