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

Merge "Add skeleton Wifi-Display tile in QS." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-09-09 00:25:48 -07:00
committed by Android (Google) Code Review
parent 20ec8ac586 508257bdfc
commit e168edb5ce
5 changed files with 280 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/AndroidManifest.xml
View File

@@ -18,6 +18,7 @@
<uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
<!-- Networking and telephony -->
<uses-permission android:name="android.permission.BLUETOOTH" />

7
packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml
View File

@@ -15,11 +15,12 @@
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/wifi_display_textview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:drawableTop="@drawable/ic_qs_wifi_normal"
android:text="@string/quick_settings_wifi_display_label"
android:singleLine="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:textAppearance="@style/TextAppearance.QuickSettings.TileView"
/>

38
packages/SystemUI/res/layout/wifi_display_dialog.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ListView android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2" />
<Button android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/wifi_display_scan" />
<Button android:id="@+id/disconnect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/wifi_display_disconnect" />
</LinearLayout>

22
packages/SystemUI/res/values/strings.xml
View File

@@ -430,5 +430,25 @@
<!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
<string name="quick_settings_wifi_no_network">No Network</string>
<!-- QuickSettings: Wifi display [CHAR LIMIT=NONE] -->
<string name="quick_settings_wifi_display_label">Wifi display</string>
<string name="quick_settings_wifi_display_label">Wifi Display</string>
<!-- QuickSettings: Wifi display [CHAR LIMIT=NONE] -->
<string name="quick_settings_wifi_display_no_connection_label">No Wifi Display Connection</string>
<!-- Wifi display: Scan button text [CHAR LIMIT=15] -->
<string name="wifi_display_scan">Scan</string>
<!-- Wifi display: Disconnect button text [CHAR LIMIT=15] -->
<string name="wifi_display_disconnect">Disconnect</string>
<!-- Wifi display: Quick setting dialog title [CHAR LIMIT=30] -->
<string name="wifi_display_dialog_title">Wifi Display</string>
<!-- Wifi display: Subtitle text shown to indicate that a display is available [CHAR LIMIT=30] -->
<string name="wifi_display_state_available">Available</string>
<!-- Wifi display: Subtitle text shown to indicate that a display is connecting [CHAR LIMIT=30] -->
<string name="wifi_display_state_connecting">Connecting</string>
<!-- Wifi display: Subtitle text shown to indicate that a display is connected [CHAR LIMIT=30] -->
<string name="wifi_display_state_connected">Connected</string>
</resources>

220
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@@ -16,36 +16,58 @@
package com.android.systemui.statusbar.phone;
import android.app.Dialog;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothAdapter.BluetoothStateChangeCallback;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.CursorLoader;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.Loader;
import android.content.res.Resources;
import android.database.Cursor;
import android.database.DataSetObserver;
import android.graphics.drawable.ClipDrawable;
import android.hardware.display.DisplayManager;
import android.hardware.display.WifiDisplay;
import android.hardware.display.WifiDisplayStatus;
import android.hardware.input.KeyboardLayout;
import android.net.Uri;
import android.provider.ContactsContract;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckedTextView;
import android.widget.ListView;
import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ListAdapter;
import java.util.ArrayList;
import java.util.Comparator;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.QuickSettingsModel.State;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback;
import com.android.systemui.statusbar.policy.BluetoothController;
import com.android.systemui.statusbar.policy.LocationController;
import com.android.systemui.statusbar.policy.LocationController.LocationGpsStateChangeCallback;
import com.android.systemui.statusbar.policy.NetworkController;
import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;
class QuickSettingsModel implements BluetoothStateChangeCallback,
NetworkController.NetworkSignalChangedCallback,
BatteryController.BatteryStateChangeCallback,
LocationController.LocationGpsStateChangeCallback {
NetworkSignalChangedCallback,
BatteryStateChangeCallback,
LocationGpsStateChangeCallback {
/** Represents the state of a given attribute. */
static class State {
@@ -77,6 +99,10 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
private RefreshCallback mWifiCallback;
private State mWifiState = new State();
private QuickSettingsTileView mWifiDisplayTile;
private RefreshCallback mWifiDisplayCallback;
private State mWifiDisplayState = new State();
private QuickSettingsTileView mRSSITile;
private RefreshCallback mRSSICallback;
private State mRSSIState = new State();
@@ -282,6 +308,32 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
}
}
// Wifi Display
void addWifiDisplayTile(QuickSettingsTileView view, RefreshCallback cb) {
mWifiDisplayTile = view;
mWifiDisplayCallback = cb;
}
private void enableWifiDisplayTile() {
mWifiDisplayTile.setVisibility(View.VISIBLE);
}
private void disableWifiDisplayTile() {
mWifiDisplayTile.setVisibility(View.GONE);
}
public void onWifiDisplayStateChanged(WifiDisplayStatus status) {
if (status.isEnabled()) {
if (status.getActiveDisplay() != null) {
mWifiDisplayState.label = status.getActiveDisplay().getDeviceName();
} else {
mWifiDisplayState.label = mContext.getString(
R.string.quick_settings_wifi_display_no_connection_label);
}
mWifiDisplayCallback.refreshView(mWifiDisplayTile, mWifiDisplayState);
enableWifiDisplayTile();
} else {
disableWifiDisplayTile();
}
}
}
/**
@@ -294,6 +346,10 @@ class QuickSettings {
private QuickSettingsModel mModel;
private QuickSettingsContainerView mContainerView;
private DisplayManager mDisplayManager;
private WifiDisplayStatus mWifiDisplayStatus;
private WifiDisplayListAdapter mWifiDisplayListAdapter;
private CursorLoader mUserInfoLoader;
// The set of QuickSettingsTiles that have dynamic spans (and need to be updated on
@@ -302,11 +358,19 @@ class QuickSettings {
new ArrayList<QuickSettingsTileView>();
public QuickSettings(Context context, QuickSettingsContainerView container) {
mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
mContext = context;
mModel = new QuickSettingsModel(context);
mContainerView = container;
mModel = new QuickSettingsModel(context);
mWifiDisplayStatus = new WifiDisplayStatus();
mWifiDisplayListAdapter = new WifiDisplayListAdapter(context);
IntentFilter filter = new IntentFilter();
filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
mContext.registerReceiver(mReceiver, filter);
setupQuickSettings();
updateWifiDisplayStatus();
updateResources();
}
@@ -551,6 +615,26 @@ class QuickSettings {
});
parent.addView(locationTile);
// Wifi Display
QuickSettingsTileView wifiDisplayTile = (QuickSettingsTileView)
inflater.inflate(R.layout.quick_settings_tile, parent, false);
wifiDisplayTile.setContent(R.layout.quick_settings_tile_wifi_display, inflater);
wifiDisplayTile.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showWifiDisplayDialog();
mBar.collapseAllPanels(true);
}
});
mModel.addWifiDisplayTile(wifiDisplayTile, new QuickSettingsModel.RefreshCallback() {
@Override
public void refreshView(QuickSettingsTileView view, State state) {
TextView tv = (TextView) view.findViewById(R.id.wifi_display_textview);
tv.setText(state.label);
}
});
parent.addView(wifiDisplayTile);
/*
QuickSettingsTileView mediaTile = (QuickSettingsTileView)
inflater.inflate(R.layout.quick_settings_tile, parent, false);
@@ -579,4 +663,132 @@ class QuickSettings {
}
mContainerView.requestLayout();
}
private void showWifiDisplayDialog() {
mDisplayManager.scanWifiDisplays();
updateWifiDisplayStatus();
Dialog dialog = new Dialog(mContext);
dialog.setContentView(R.layout.wifi_display_dialog);
dialog.setCanceledOnTouchOutside(true);
dialog.setTitle(R.string.wifi_display_dialog_title);
Button scanButton = (Button)dialog.findViewById(R.id.scan);
scanButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mDisplayManager.scanWifiDisplays();
}
});
Button disconnectButton = (Button)dialog.findViewById(R.id.disconnect);
disconnectButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mDisplayManager.disconnectWifiDisplay();
}
});
ListView list = (ListView)dialog.findViewById(R.id.list);
list.setAdapter(mWifiDisplayListAdapter);
list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
WifiDisplay display = mWifiDisplayListAdapter.getItem(position);
mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
}
});
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
dialog.show();
}
private void updateWifiDisplayStatus() {
applyWifiDisplayStatus(mDisplayManager.getWifiDisplayStatus());
}
private void applyWifiDisplayStatus(WifiDisplayStatus status) {
mWifiDisplayStatus = status;
mWifiDisplayListAdapter.clear();
mWifiDisplayListAdapter.addAll(status.getKnownDisplays());
if (status.getActiveDisplay() != null
&& !contains(status.getKnownDisplays(), status.getActiveDisplay())) {
mWifiDisplayListAdapter.add(status.getActiveDisplay());
}
mWifiDisplayListAdapter.sort(mWifiDisplayComparator);
mModel.onWifiDisplayStateChanged(status);
}
private static boolean contains(WifiDisplay[] displays, WifiDisplay display) {
for (WifiDisplay d : displays) {
if (d.equals(display)) {
return true;
}
}
return false;
}
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (intent.getAction().equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {
WifiDisplayStatus status = (WifiDisplayStatus)intent.getParcelableExtra(
DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
applyWifiDisplayStatus(status);
}
}
};
private final class WifiDisplayListAdapter extends ArrayAdapter<WifiDisplay> {
private final LayoutInflater mInflater;
public WifiDisplayListAdapter(Context context) {
super(context, android.R.layout.simple_list_item_2);
mInflater = LayoutInflater.from(context);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
WifiDisplay item = getItem(position);
View view = convertView;
if (view == null) {
view = mInflater.inflate(android.R.layout.simple_list_item_2,
parent, false);
}
TextView headline = (TextView) view.findViewById(android.R.id.text1);
TextView subText = (TextView) view.findViewById(android.R.id.text2);
headline.setText(item.getDeviceName());
int state = WifiDisplayStatus.DISPLAY_STATE_NOT_CONNECTED;
if (item.equals(mWifiDisplayStatus.getActiveDisplay())) {
state = mWifiDisplayStatus.getActiveDisplayState();
}
switch (state) {
case WifiDisplayStatus.DISPLAY_STATE_CONNECTING:
subText.setText(R.string.wifi_display_state_connecting);
break;
case WifiDisplayStatus.DISPLAY_STATE_CONNECTED:
subText.setText(R.string.wifi_display_state_connected);
break;
case WifiDisplayStatus.DISPLAY_STATE_NOT_CONNECTED:
default:
subText.setText(R.string.wifi_display_state_available);
break;
}
return view;
}
}
private final Comparator<WifiDisplay> mWifiDisplayComparator = new Comparator<WifiDisplay>() {
@Override
public int compare(WifiDisplay lhs, WifiDisplay rhs) {
int c = lhs.getDeviceName().compareToIgnoreCase(rhs.getDeviceName());
if (c == 0) {
c = lhs.getDeviceAddress().compareToIgnoreCase(rhs.getDeviceAddress());
}
return c;
}
};
}