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

Commit 4e54c2a1 authored by Jeff Brown's avatar Jeff Brown
Browse files

Integrate remote display routes into screen cast settings UI. 

Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
parent a27816dc

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -1343,7 +1343,6 @@ 
        </activity>



        <activity android:name="Settings$WifiDisplaySettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/wifi_display_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

res/values/strings.xml

+6 −28
Original line number Diff line number Diff line
@@ -1226,37 +1226,22 @@ 
    <string name="bluetooth_dock_settings_remember">Remember settings</string>



    <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->

    <string name="wifi_display_settings_title">Wireless display</string>

    <!-- Wifi Display settings. Text displayed when Wifi display is off and device list is empty [CHAR LIMIT=80]-->

    <string name="wifi_display_settings_empty_list_wifi_display_off">To see devices, turn wireless display on.</string>

    <!-- Wifi Display settings. Text displayed when Wifi Display is off and device list is empty [CHAR LIMIT=80]-->

    <string name="wifi_display_settings_empty_list_wifi_display_disabled">Wireless display is disabled because Wi\u2011Fi is off.</string>

    <!-- Wifi Display settings. The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->

    <string name="wifi_display_search_for_devices">Search for displays</string>

    <!-- Wifi Display settings. The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->

    <string name="wifi_display_searching_for_devices">Searching\u2026</string>

    <string name="wifi_display_settings_title">Cast screen</string>

    <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->

    <string name="wifi_display_enable_menu_item">Enable wireless display</string>

    <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->

    <string name="wifi_display_no_devices_found">No nearby wireless displays were found.</string>

    <!-- Wifi Display settings. The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->

    <string name="wifi_display_paired_devices">Paired displays</string>

    <!-- Wifi Display settings. The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->

    <string name="wifi_display_available_devices">Available devices</string>

    <string name="wifi_display_no_devices_found">No nearby devices were found.</string>

    <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_connecting">Connecting</string>

    <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_connected">Connected</string>

    <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_available">Available</string>

    <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_in_use">In use</string>

    <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_not_available">Unavailable</string>

    <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->

    <string name="wifi_display_details">Display settings</string>



    <!-- Wifi Display settings. Disconnect dialog.  The title of the dialog. [CHAR LIMIT=40] -->

    <string name="wifi_display_disconnect_title">Disconnect?</string>

    <!-- Wifi Display settings. Disconnect dialog.  Message for disconnecting from the display. [CHAR LIMIT=NONE] -->

    <string name="wifi_display_disconnect_text">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>



    <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->

    <string name="wifi_display_options_title">Wireless display options</string>

    <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
@@ -1266,13 +1251,6 @@ 
    <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->

    <string name="wifi_display_options_name">Name</string>



    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'On' state. [CHAR LIMIT=40] -->

    <string name="wifi_display_summary_on">On</string>

    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Off' state. [CHAR LIMIT=40] -->

    <string name="wifi_display_summary_off">Off</string>

    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Disabled' state. [CHAR LIMIT=40] -->

    <string name="wifi_display_summary_disabled">Disabled</string>



    <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->

    <string name="wifi_display_certification_heading" translatable="false">Certification</string>

    <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->

src/com/android/settings/DisplaySettings.java

+1 −62
Original line number Diff line number Diff line
@@ -21,16 +21,10 @@ import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; 
import android.app.ActivityManagerNative;

import android.app.Dialog;

import android.app.admin.DevicePolicyManager;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.hardware.display.DisplayManager;

import android.hardware.display.WifiDisplay;

import android.hardware.display.WifiDisplayStatus;

import android.os.Bundle;

import android.os.RemoteException;

import android.preference.CheckBoxPreference;
@@ -40,7 +34,6 @@ import android.preference.Preference.OnPreferenceClickListener; 
import android.preference.PreferenceScreen;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.util.AttributeSet;

import android.util.Log;



import com.android.internal.view.RotationPolicy;
@@ -60,12 +53,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private static final String KEY_FONT_SIZE = "font_size";

    private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";

    private static final String KEY_SCREEN_SAVER = "screensaver";

    private static final String KEY_WIFI_DISPLAY = "wifi_display";



    private static final int DLG_GLOBAL_CHANGE_WARNING = 1;



    private DisplayManager mDisplayManager;



    private CheckBoxPreference mAccelerometer;

    private WarnedListPreference mFontSizePref;

    private CheckBoxPreference mNotificationPulse;
@@ -75,9 +65,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private ListPreference mScreenTimeoutPreference;

    private Preference mScreenSaverPreference;



    private WifiDisplayStatus mWifiDisplayStatus;

    private Preference mWifiDisplayPreference;



    private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =

            new RotationPolicy.RotationPolicyListener() {

        @Override
@@ -135,16 +122,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
                Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");

            }

        }



        mDisplayManager = (DisplayManager)getActivity().getSystemService(

                Context.DISPLAY_SERVICE);

        mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();

        mWifiDisplayPreference = (Preference)findPreference(KEY_WIFI_DISPLAY);

        if (mWifiDisplayStatus.getFeatureState()

                == WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {

            getPreferenceScreen().removePreference(mWifiDisplayPreference);

            mWifiDisplayPreference = null;

        }

    }



    private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -252,12 +229,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        RotationPolicy.registerRotationPolicyListener(getActivity(),

                mRotationPolicyListener);



        if (mWifiDisplayPreference != null) {

            getActivity().registerReceiver(mReceiver, new IntentFilter(

                    DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED));

            mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();

        }



        updateState();

    }
@@ -267,10 +238,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 


        RotationPolicy.unregisterRotationPolicyListener(getActivity(),

                mRotationPolicyListener);



        if (mWifiDisplayPreference != null) {

            getActivity().unregisterReceiver(mReceiver);

        }

    }



    @Override
@@ -291,7 +258,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        updateAccelerometerRotationCheckbox();

        readFontSizePreference(mFontSizePref);

        updateScreenSaverSummary();

        updateWifiDisplaySummary();

    }



    private void updateScreenSaverSummary() {
@@ -301,23 +267,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        }

    }



    private void updateWifiDisplaySummary() {

        if (mWifiDisplayPreference != null) {

            switch (mWifiDisplayStatus.getFeatureState()) {

                case WifiDisplayStatus.FEATURE_STATE_OFF:

                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_off);

                    break;

                case WifiDisplayStatus.FEATURE_STATE_ON:

                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_on);

                    break;

                case WifiDisplayStatus.FEATURE_STATE_DISABLED:

                default:

                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_disabled);

                    break;

            }

        }

    }



    private void updateAccelerometerRotationCheckbox() {

        if (getActivity() == null) return;
@@ -347,6 +296,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        return super.onPreferenceTreeClick(preferenceScreen, preference);

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object objValue) {

        final String key = preference.getKey();

        if (KEY_SCREEN_TIMEOUT.equals(key)) {
@@ -365,17 +315,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        return true;

    }



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction().equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {

                mWifiDisplayStatus = (WifiDisplayStatus)intent.getParcelableExtra(

                        DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);

                updateWifiDisplaySummary();

            }

        }

    };



    @Override

    public boolean onPreferenceClick(Preference preference) {

        if (preference == mFontSizePref) {

src/com/android/settings/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ public class Settings extends PreferenceActivity 
        // uiOptions for fragments also defined as activities in manifest.

        if (WifiSettings.class.getName().equals(fragmentName) ||

                WifiP2pSettings.class.getName().equals(fragmentName) ||

                WifiDisplaySettings.class.getName().equals(fragmentName) ||

                BluetoothSettings.class.getName().equals(fragmentName) ||

                DreamSettings.class.getName().equals(fragmentName) ||

                LocationSettings.class.getName().equals(fragmentName) ||

src/com/android/settings/wfd/WifiDisplaySettings.java

+254 −190

File changed.

Preview size limit exceeded, changes collapsed.