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

Commit 43df6408 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "QS: Rename WiFiDisplay to RemoteDisplay" into cm-11.0

parents 8b29662f 7f872843

packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java→packages/SystemUI/src/com/android/systemui/quicksettings/RemoteDisplayTile.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ import com.android.systemui.statusbar.phone.QuickSettingsController; 
import com.android.systemui.statusbar.phone.QuickSettingsContainerView;

import com.android.systemui.statusbar.phone.QuickSettingsTileView;



public class WiFiDisplayTile extends QuickSettingsTile{

public class RemoteDisplayTile extends QuickSettingsTile{



    private boolean enabled = false;

    private boolean connecting;
@@ -22,7 +22,7 @@ public class WiFiDisplayTile extends QuickSettingsTile{ 
    private final RemoteDisplayRouteCallback mRemoteDisplayRouteCallback;

    private MediaRouter.RouteInfo connectedRoute;



    public WiFiDisplayTile(Context context, 

    public RemoteDisplayTile(Context context, 

            QuickSettingsController qsc) {

        super(context, qsc);

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ import com.android.systemui.quicksettings.TorchTile; 
import com.android.systemui.quicksettings.UsbTetherTile;

import com.android.systemui.quicksettings.UserTile;

import com.android.systemui.quicksettings.VolumeTile;

import com.android.systemui.quicksettings.WiFiDisplayTile;

import com.android.systemui.quicksettings.RemoteDisplayTile;

import com.android.systemui.quicksettings.WiFiTile;

import com.android.systemui.quicksettings.WifiAPTile;
@@ -313,7 +313,7 @@ public class QuickSettingsController { 
        }

        if (Settings.System.getIntForUser(resolver,

                    Settings.System.QS_DYNAMIC_WIFI, 1, UserHandle.USER_CURRENT) == 1) {

            QuickSettingsTile qs = new WiFiDisplayTile(mContext, this);

            QuickSettingsTile qs = new RemoteDisplayTile(mContext, this);

            qs.setupQuickSettingsTile(inflater, mContainerView);

            mQuickSettingsTiles.add(qs);

        }