PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log visibility change for DialogCreatable in Settings.

Browse Source 
Bug: 30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Test: make RunSettingsRoboTests
Change-Id: I51754d258ba1ddfae24323681f21cd02de4dbb4e
This commit is contained in:
Fan Zhang
2016-09-19 17:45:24 -07:00
parent 4b2406f3f3
commit d65184faef
19 changed files with 307 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
View File

@@ -25,6 +25,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.MetricsProto;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -151,6 +152,16 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
return super.onCreateDialog(dialogId);
}
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case WifiSettings.WIFI_DIALOG_ID:
return MetricsProto.MetricsEvent.DIALOG_WIFI_SAVED_AP_EDIT;
default:
return 0;
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

16
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -597,6 +597,22 @@ public class WifiSettings extends RestrictedSettingsFragment
return super.onCreateDialog(dialogId);
}
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case WIFI_DIALOG_ID:
return MetricsEvent.DIALOG_WIFI_AP_EDIT;
case WPS_PBC_DIALOG_ID:
return MetricsEvent.DIALOG_WIFI_PBC;
case WPS_PIN_DIALOG_ID:
return MetricsEvent.DIALOG_WIFI_PIN;
case WRITE_NFC_DIALOG_ID:
return MetricsEvent.DIALOG_WIFI_WRITE_NFC;
default:
return 0;
}
}
/**
* Shows the latest access points available with supplemental information like
* the strength of network and the security for it.

15
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -495,6 +495,21 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
return MetricsEvent.WIFI_P2P;
}
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_DISCONNECT:
return MetricsEvent.DIALOG_WIFI_P2P_DISCONNECT;
case DIALOG_CANCEL_CONNECT:
return MetricsEvent.DIALOG_WIFI_P2P_CANCEL_CONNECT;
case DIALOG_RENAME:
return MetricsEvent.DIALOG_WIFI_P2P_RENAME;
case DIALOG_DELETE_GROUP:
return MetricsEvent.DIALOG_WIFI_P2P_DELETE_GROUP;
}
return 0;
}
@Override
public void onSaveInstanceState(Bundle outState) {
if (mSelectedWifiPeer != null) {