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

Revert "Revert "Add a new logger for StatsLog""

Browse Source 
This reverts commit f14d4af767.
Test: rebuild

Reason for revert: Fixes build

Change-Id: I003af1d9c973e58c09b1d8b9717c427febd6f809
This commit is contained in:
Fan Zhang
2018-11-10 18:14:42 +00:00
parent 3c7841c94a
commit 1e4e80162e
9 changed files with 149 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.network.telephony;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -31,7 +32,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
@@ -75,7 +75,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.MOBILE_NETWORK;
return SettingsEnums.MOBILE_NETWORK;
}
/**

5
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -15,9 +15,8 @@
*/
package com.android.settings.network.telephony;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.MOBILE_NETWORK_SELECT;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
@@ -203,7 +202,7 @@ public class NetworkSelectSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MOBILE_NETWORK_SELECT;
return SettingsEnums.MOBILE_NETWORK_SELECT;
}
private final Handler mHandler = new Handler() {

4
src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.network.telephony.gsm;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.PersistableBundle;
@@ -26,7 +27,6 @@ import android.telephony.TelephonyManager;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.TogglePreferenceController;
@@ -100,7 +100,7 @@ public class AutoSelectPreferenceController extends TogglePreferenceController {
bundle.putInt(Settings.EXTRA_SUB_ID, mSubId);
new SubSettingLauncher(mContext)
.setDestination(NetworkSelectSettings.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.MOBILE_NETWORK_SELECT)
.setSourceMetricsCategory(SettingsEnums.MOBILE_NETWORK_SELECT)
.setTitleRes(R.string.choose_network_title)
.setArguments(bundle)
.launch();

4
src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.network.telephony.gsm;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
@@ -27,7 +28,6 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
@@ -88,7 +88,7 @@ public class OpenNetworkSelectPagePreferenceController extends BasePreferenceCon
bundle.putInt(Settings.EXTRA_SUB_ID, mSubId);
new SubSettingLauncher(mContext)
.setDestination(NetworkSelectSettings.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.MOBILE_NETWORK_SELECT)
.setSourceMetricsCategory(SettingsEnums.MOBILE_NETWORK_SELECT)
.setTitleRes(R.string.choose_network_title)
.setArguments(bundle)
.launch();