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

Merge changes from topic "settings_westworld"

Browse Source 
* changes:
  Reset allow background activity to default on
  Migrate all MetricsProto enums to SettingsEnums
This commit is contained in:
TreeHugger Robot
2019-01-19 04:09:50 +00:00
committed by Android (Google) Code Review
parent 7c7e0d4d7d fb90429930
commit 4012a31c24
503 changed files with 1191 additions and 1358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -20,6 +20,7 @@ import static android.os.Vibrator.VibrationIntensity;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -51,7 +52,6 @@ import androidx.preference.SwitchPreference;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.R;
@@ -273,7 +273,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY;
return SettingsEnums.ACCESSIBILITY;
}
@Override