Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28cc38c4 authored by Christofer Åkersten's avatar Christofer Åkersten Committed by android-build-merger
Browse files

Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev 

am: 8cbb5ffd

Change-Id: I4572f4f221c6b50cf41ddb094cf7bb9d2d48bfbd
parents aa6c5507 8cbb5ffd

core/java/com/android/internal/app/MediaRouteChooserDialog.java

+9 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.media.MediaRouter; 
import android.media.MediaRouter.RouteInfo;

import android.os.Bundle;

import android.text.TextUtils;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -130,7 +131,8 @@ public class MediaRouteChooserDialog extends Dialog { 


        // Must be called after setContentView.

        getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,

                R.drawable.ic_media_route_off_holo_dark);

                isLightTheme(getContext()) ? R.drawable.ic_media_route_off_holo_light

                    : R.drawable.ic_media_route_off_holo_dark);



        mAdapter = new RouteAdapter(getContext());

        mListView = (ListView)findViewById(R.id.media_route_list);
@@ -176,6 +178,12 @@ public class MediaRouteChooserDialog extends Dialog { 
        }

    }



    static boolean isLightTheme(Context context) {

        TypedValue value = new TypedValue();

        return context.getTheme().resolveAttribute(R.attr.isLightTheme, value, true)

                && value.data != 0;

    }



    private final class RouteAdapter extends ArrayAdapter<MediaRouter.RouteInfo>

            implements ListView.OnItemClickListener {

        private final LayoutInflater mInflater;

core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -43,8 +43,12 @@ public class MediaRouteChooserDialogFragment extends DialogFragment { 
     * </p>

     */

    public MediaRouteChooserDialogFragment() {

        int theme = MediaRouteChooserDialog.isLightTheme(getContext())

                ? android.R.style.Theme_DeviceDefault_Light_Dialog

                : android.R.style.Theme_DeviceDefault_Dialog;



        setCancelable(true);

        setStyle(STYLE_NORMAL, android.R.style.Theme_DeviceDefault_Dialog);

        setStyle(STYLE_NORMAL, theme);

    }



    public int getRouteTypes() {

core/java/com/android/internal/app/MediaRouteDialogPresenter.java

+6 −4
Original line number Diff line number Diff line
@@ -71,16 +71,18 @@ public abstract class MediaRouteDialogPresenter { 
        final MediaRouter router = (MediaRouter)context.getSystemService(

                Context.MEDIA_ROUTER_SERVICE);



        int theme = MediaRouteChooserDialog.isLightTheme(context)

                ? android.R.style.Theme_DeviceDefault_Light_Dialog

                : android.R.style.Theme_DeviceDefault_Dialog;



        MediaRouter.RouteInfo route = router.getSelectedRoute();

        if (route.isDefault() || !route.matchesTypes(routeTypes)) {

            final MediaRouteChooserDialog d = new MediaRouteChooserDialog(

                    context, android.R.style.Theme_DeviceDefault_Dialog);

            final MediaRouteChooserDialog d = new MediaRouteChooserDialog(context, theme);

            d.setRouteTypes(routeTypes);

            d.setExtendedSettingsClickListener(extendedSettingsClickListener);

            return d;

        } else {

            MediaRouteControllerDialog d = new MediaRouteControllerDialog(

                    context, android.R.style.Theme_DeviceDefault_Dialog);

            MediaRouteControllerDialog d = new MediaRouteControllerDialog(context, theme);

            return d;

        }

    }

core/res/res/drawable-hdpi/ic_media_route_disabled_mtrl_alpha.png

deleted100644 → 0
−409 B
Loading image diff...

core/res/res/drawable-hdpi/ic_media_route_disabled_mtrl_dark.png

0 → 100644
+495 B
Loading image diff...