SuW: Remove PG bits

Change-Id: Ic7297e0dcf1c9b438171e5ebe688e83e5cb121e9

src/org/lineageos/setupwizard/FinishActivity.java

@@ -19,7 +19,6 @@ package org.lineageos.setupwizard;
 
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_BUTTON_BACKLIGHT;
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
 import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
@@ -169,7 +168,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
         if (mEnableAccessibilityController != null) {
             mEnableAccessibilityController.onDestroy();
         }
-        handlePrivacyGuard(mSetupWizardApp);
         handleEnableMetrics(mSetupWizardApp);
         handleNavKeys(mSetupWizardApp);
         final WallpaperManager wallpaperManager =
@@ -191,15 +189,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
         }
     }
 
-    private static void handlePrivacyGuard(SetupWizardApp setupWizardApp) {
-        Bundle mPrivacyData = setupWizardApp.getSettingsBundle();
-        if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {
-            LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
-                    LineageSettings.Secure.PRIVACY_GUARD_DEFAULT,
-                    mPrivacyData.getBoolean(KEY_PRIVACY_GUARD) ? 1 : 0);
-        }
-    }
-
     private static void handleNavKeys(SetupWizardApp setupWizardApp) {
         if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
             writeDisableNavkeysOption(setupWizardApp,

src/org/lineageos/setupwizard/LineageSettingsActivity.java

@@ -18,7 +18,6 @@
 package org.lineageos.setupwizard;
 
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
 
 import android.app.Activity;
@@ -58,7 +57,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
 
     private CheckBox mMetrics;
     private CheckBox mNavKeys;
-    private CheckBox mPrivacyGuard;
 
     private boolean mSupportsKeyDisabler = false;
 
@@ -74,12 +72,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         mSetupWizardApp.getSettingsBundle().putBoolean(DISABLE_NAV_KEYS, checked);
     };
 
-    private View.OnClickListener mPrivacyGuardClickListener = view -> {
-        boolean checked = !mPrivacyGuard.isChecked();
-        mPrivacyGuard.setChecked(checked);
-        mSetupWizardApp.getSettingsBundle().putBoolean(KEY_PRIVACY_GUARD, checked);
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -132,12 +124,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         } else {
             navKeysRow.setVisibility(View.GONE);
         }
-
-        View privacyGuardRow = findViewById(R.id.privacy_guard);
-        privacyGuardRow.setOnClickListener(mPrivacyGuardClickListener);
-        mPrivacyGuard = (CheckBox) findViewById(R.id.privacy_guard_checkbox);
-        mPrivacyGuard.setChecked(LineageSettings.Secure.getInt(getContentResolver(),
-                LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1);
     }
 
     @Override
@@ -145,7 +131,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         super.onResume();
         updateDisableNavkeysOption();
         updateMetricsOption();
-        updatePrivacyGuardOption();
     }
 
     @Override
@@ -201,17 +186,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         }
     }
 
-    private void updatePrivacyGuardOption() {
-        final Bundle bundle = mSetupWizardApp.getSettingsBundle();
-        boolean enabled = LineageSettings.Secure.getInt(getContentResolver(),
-                LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) != 0;
-        boolean checked = bundle.containsKey(KEY_PRIVACY_GUARD) ?
-                bundle.getBoolean(KEY_PRIVACY_GUARD) :
-                enabled;
-        mPrivacyGuard.setChecked(checked);
-        bundle.putBoolean(KEY_PRIVACY_GUARD, checked);
-    }
-
     private static boolean isKeyDisablerSupported(Context context) {
         final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
         return hardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE);

src/org/lineageos/setupwizard/SetupWizardApp.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2019 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@ public class SetupWizardApp extends Application {
     public static final String KEY_SEND_METRICS = "send_metrics";
     public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
     public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
-    public static final String KEY_PRIVACY_GUARD = "privacy_guard_default";
 
     public static final int REQUEST_CODE_SETUP_WIFI = 0;
     public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;