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

Remove redundant wifi-display notification.

Browse Source 
Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.

Bug:17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
This commit is contained in:
John Spurlock
2014-09-23 15:51:11 -04:00
parent 23e79fcef9
commit 03365ccc39
8 changed files with 0 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/ic_notification_cast_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 470 B

BIN
core/res/res/drawable-mdpi/ic_notification_cast_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 342 B

BIN
core/res/res/drawable-xhdpi/ic_notification_cast_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 596 B

BIN
core/res/res/drawable-xxhdpi/ic_notification_cast_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 934 B

26
core/res/res/drawable/ic_notification_cast_connecting.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2013, 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.
*/
-->
<animation-list
xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item android:drawable="@drawable/ic_notification_cast_0" android:duration="500" />
<item android:drawable="@drawable/ic_notification_cast_1" android:duration="500" />
<item android:drawable="@drawable/ic_notification_cast_2" android:duration="500" />
<item android:drawable="@drawable/ic_notification_cast_1" android:duration="500" />
</animation-list>

11
core/res/res/values/strings.xml
View File

@@ -4409,17 +4409,6 @@
<!-- Title text to append when the display is secure. [CHAR LIMIT=30] -->
<string name="display_manager_overlay_display_secure_suffix">, secure</string>
<!-- Title of the notification to indicate the process of connecting to a wifi display. [CHAR LIMIT=50] -->
<string name="wifi_display_notification_connecting_title">Casting screen</string>
<!-- Message of the notification to indicate the process of connecting to a wifi display. [CHAR LIMIT=80] -->
<string name="wifi_display_notification_connecting_message">Connecting to <xliff:g id="name">%1$s</xliff:g></string>
<!-- Title of the notification to indicate an active wifi display connection. [CHAR LIMIT=50] -->
<string name="wifi_display_notification_connected_title">Casting screen</string>
<!-- Message of the notification to indicate an active wifi display connection. [CHAR LIMIT=80] -->
<string name="wifi_display_notification_connected_message">Connected to <xliff:g id="name">%1$s</xliff:g></string>
<!-- Label of a button to disconnect an active wifi display connection. [CHAR LIMIT=25] -->
<string name="wifi_display_notification_disconnect">Disconnect</string>
<!-- Keyguard strings -->
<!-- Label shown on emergency call button in keyguard -->
<string name="kg_emergency_call_label">Emergency call</string>

7
core/res/res/values/symbols.xml
View File

@@ -1185,8 +1185,6 @@
<java-symbol type="drawable" name="ic_media_route_off_holo_dark" />
<java-symbol type="drawable" name="ic_media_route_connecting_holo_dark" />
<java-symbol type="drawable" name="ic_media_route_disabled_holo_dark" />
<java-symbol type="drawable" name="ic_notification_cast_connecting" />
<java-symbol type="drawable" name="ic_notification_cast_on" />
<java-symbol type="drawable" name="cling_button" />
<java-symbol type="drawable" name="cling_arrow_up" />
<java-symbol type="drawable" name="cling_bg" />
@@ -1723,11 +1721,6 @@
<java-symbol type="string" name="vpn_lockdown_error" />
<java-symbol type="string" name="vpn_lockdown_config" />
<java-symbol type="string" name="wallpaper_binding_label" />
<java-symbol type="string" name="wifi_display_notification_connecting_title" />
<java-symbol type="string" name="wifi_display_notification_connecting_message" />
<java-symbol type="string" name="wifi_display_notification_connected_title" />
<java-symbol type="string" name="wifi_display_notification_connected_message" />
<java-symbol type="string" name="wifi_display_notification_disconnect" />
<java-symbol type="style" name="Theme.Dialog.AppError" />
<java-symbol type="style" name="Theme.Micro.Dialog.Alert" />
<java-symbol type="style" name="Theme.Leanback.Dialog.Alert" />

112
services/core/java/com/android/server/display/WifiDisplayAdapter.java
View File

@@ -16,18 +16,13 @@
package com.android.server.display;
import com.android.internal.R;
import com.android.internal.util.DumpUtils;
import com.android.internal.util.IndentingPrintWriter;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.hardware.display.DisplayManager;
import android.hardware.display.WifiDisplay;
import android.hardware.display.WifiDisplaySessionInfo;
@@ -38,7 +33,6 @@ import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog;
import android.view.Display;
import android.view.Surface;
@@ -71,17 +65,12 @@ final class WifiDisplayAdapter extends DisplayAdapter {
private static final boolean DEBUG = false;
private static final int MSG_SEND_STATUS_CHANGE_BROADCAST = 1;
private static final int MSG_UPDATE_NOTIFICATION = 2;
private static final String ACTION_DISCONNECT = "android.server.display.wfd.DISCONNECT";
private final WifiDisplayHandler mHandler;
private final PersistentDataStore mPersistentDataStore;
private final boolean mSupportsProtectedBuffers;
private final NotificationManager mNotificationManager;
private PendingIntent mSettingsPendingIntent;
private PendingIntent mDisconnectPendingIntent;
private WifiDisplayController mDisplayController;
private WifiDisplayDevice mDisplayDevice;
@@ -97,7 +86,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
private WifiDisplaySessionInfo mSessionInfo;
private boolean mPendingStatusChangeBroadcast;
private boolean mPendingNotificationUpdate;
// Called with SyncRoot lock held.
public WifiDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
@@ -108,8 +96,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
mPersistentDataStore = persistentDataStore;
mSupportsProtectedBuffers = context.getResources().getBoolean(
com.android.internal.R.bool.config_wifiDisplaySupportsProtectedBuffers);
mNotificationManager = (NotificationManager)context.getSystemService(
Context.NOTIFICATION_SERVICE);
}
@Override
@@ -125,7 +111,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
pw.println("mAvailableDisplays=" + Arrays.toString(mAvailableDisplays));
pw.println("mRememberedDisplays=" + Arrays.toString(mRememberedDisplays));
pw.println("mPendingStatusChangeBroadcast=" + mPendingStatusChangeBroadcast);
pw.println("mPendingNotificationUpdate=" + mPendingNotificationUpdate);
pw.println("mSupportsProtectedBuffers=" + mSupportsProtectedBuffers);
// Try to dump the controller state.
@@ -421,13 +406,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
}
}
private void scheduleUpdateNotificationLocked() {
if (!mPendingNotificationUpdate) {
mPendingNotificationUpdate = true;
mHandler.sendEmptyMessage(MSG_UPDATE_NOTIFICATION);
}
}
// Runs on the handler.
private void handleSendStatusChangeBroadcast() {
final Intent intent;
@@ -447,87 +425,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
getContext().sendBroadcastAsUser(intent, UserHandle.ALL);
}
// Runs on the handler.
private void handleUpdateNotification() {
final int state;
final WifiDisplay display;
synchronized (getSyncRoot()) {
if (!mPendingNotificationUpdate) {
return;
}
mPendingNotificationUpdate = false;
state = mActiveDisplayState;
display = mActiveDisplay;
}
// Cancel the old notification if there is one.
mNotificationManager.cancelAsUser(null,
R.string.wifi_display_notification_disconnect, UserHandle.ALL);
if (state == WifiDisplayStatus.DISPLAY_STATE_CONNECTING
|| state == WifiDisplayStatus.DISPLAY_STATE_CONNECTED) {
Context context = getContext();
// Initialize pending intents for the notification outside of the lock because
// creating a pending intent requires a call into the activity manager.
if (mSettingsPendingIntent == null) {
Intent settingsIntent = new Intent(Settings.ACTION_WIFI_DISPLAY_SETTINGS);
settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
mSettingsPendingIntent = PendingIntent.getActivityAsUser(
context, 0, settingsIntent, 0, null, UserHandle.CURRENT);
}
if (mDisconnectPendingIntent == null) {
Intent disconnectIntent = new Intent(ACTION_DISCONNECT);
mDisconnectPendingIntent = PendingIntent.getBroadcastAsUser(
context, 0, disconnectIntent, 0, UserHandle.CURRENT);
}
// Post the notification.
Resources r = context.getResources();
Notification notification;
if (state == WifiDisplayStatus.DISPLAY_STATE_CONNECTING) {
notification = new Notification.Builder(context)
.setContentTitle(r.getString(
R.string.wifi_display_notification_connecting_title))
.setContentText(r.getString(
R.string.wifi_display_notification_connecting_message,
display.getFriendlyDisplayName()))
.setContentIntent(mSettingsPendingIntent)
.setSmallIcon(R.drawable.ic_notification_cast_connecting)
.setOngoing(true)
.addAction(android.R.drawable.ic_menu_close_clear_cancel,
r.getString(R.string.wifi_display_notification_disconnect),
mDisconnectPendingIntent)
.setColor(r.getColor(
com.android.internal.R.color.system_notification_accent_color))
.build();
} else {
notification = new Notification.Builder(context)
.setContentTitle(r.getString(
R.string.wifi_display_notification_connected_title))
.setContentText(r.getString(
R.string.wifi_display_notification_connected_message,
display.getFriendlyDisplayName()))
.setContentIntent(mSettingsPendingIntent)
.setSmallIcon(R.drawable.ic_notification_cast_on)
.setOngoing(true)
.addAction(android.R.drawable.ic_menu_close_clear_cancel,
r.getString(R.string.wifi_display_notification_disconnect),
mDisconnectPendingIntent)
.setColor(r.getColor(
com.android.internal.R.color.system_notification_accent_color))
.build();
}
mNotificationManager.notifyAsUser(null,
R.string.wifi_display_notification_disconnect,
notification, UserHandle.ALL);
}
}
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -605,7 +502,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_CONNECTING;
mActiveDisplay = display;
scheduleStatusChangedBroadcastLocked();
scheduleUpdateNotificationLocked();
}
}
}
@@ -618,7 +514,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_NOT_CONNECTED;
mActiveDisplay = null;
scheduleStatusChangedBroadcastLocked();
scheduleUpdateNotificationLocked();
}
}
}
@@ -636,7 +531,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_CONNECTED;
mActiveDisplay = display;
scheduleStatusChangedBroadcastLocked();
scheduleUpdateNotificationLocked();
}
}
}
@@ -659,7 +553,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
mActiveDisplay = display;
renameDisplayDeviceLocked(display.getFriendlyDisplayName());
scheduleStatusChangedBroadcastLocked();
scheduleUpdateNotificationLocked();
}
}
}
@@ -675,7 +568,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
mActiveDisplayState = WifiDisplayStatus.DISPLAY_STATE_NOT_CONNECTED;
mActiveDisplay = null;
scheduleStatusChangedBroadcastLocked();
scheduleUpdateNotificationLocked();
}
}
}
@@ -755,10 +647,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
case MSG_SEND_STATUS_CHANGE_BROADCAST:
handleSendStatusChangeBroadcast();
break;
case MSG_UPDATE_NOTIFICATION:
handleUpdateNotification();
break;
}
}
}