Misc fixes

- Deprecate CopyablePreference
- Update search icon for connected device page

Fix: 36006104
Fix: 35948464
Test: make RunSettingsRoboTests

Change-Id: I0f48028b50d347484b4dd2c7844e782d374715d4
This commit is contained in:
Fan Zhang
2017-03-08 09:24:45 -08:00
parent e32788c630
commit 92831fc7ad
4 changed files with 45 additions and 94 deletions

View File

@@ -16,8 +16,11 @@
package com.android.settings.notification;
import android.app.*;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.INotificationManager;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.IntentSender;
@@ -26,7 +29,12 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.*;
import android.os.Bundle;
import android.os.Handler;
import android.os.Parcel;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.service.notification.NotificationListenerService;
import android.service.notification.NotificationListenerService.Ranking;
import android.service.notification.NotificationListenerService.RankingMap;
@@ -45,13 +53,15 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.CopyablePreference;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import java.lang.StringBuilder;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
public class NotificationStation extends SettingsPreferenceFragment {
private static final String TAG = NotificationStation.class.getSimpleName();
@@ -533,7 +543,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
return null;
}
private static class HistoricalNotificationPreference extends CopyablePreference {
private static class HistoricalNotificationPreference extends Preference {
private final HistoricalNotificationInfo mInfo;
public HistoricalNotificationPreference(Context context, HistoricalNotificationInfo info) {
@@ -573,14 +583,6 @@ public class NotificationStation extends SettingsPreferenceFragment {
row.itemView.setAlpha(mInfo.active ? 1.0f : 0.5f);
}
@Override
public CharSequence getCopyableText() {
return new SpannableStringBuilder(mInfo.title)
.append(" [").append(new Date(mInfo.timestamp).toString())
.append("]\n").append(mInfo.pkgname)
.append("\n").append(mInfo.extra);
}
@Override
public void performClick() {
// Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS,