From 5c108a0b27d3598a39d44a8b0edd1fb261365cde Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Wed, 8 Apr 2020 14:24:59 +0800
Subject: [PATCH] Add back the entrance of magnification settings in master
 branch

Bug: 146473544
Test: make RunSettingsRoboTests
Change-Id: I2e040c0b722944077dd026c32f195e5a45a52c88
---
 .../ToggleScreenMagnificationPreferenceFragment.java     | 5 +++++
 ...eenMagnificationPreferenceFragmentForSetupWizard.java | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index a9667bb54b1..bc5d5a425f0 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -187,6 +187,11 @@ public class ToggleScreenMagnificationPreferenceFragment extends
 
         initShortcutPreference();
 
+        mSettingsPreference = new Preference(getPrefContext());
+        mSettingsPreference.setTitle(R.string.accessibility_menu_item_settings);
+        mSettingsPreference.setFragment(MagnificationSettingsFragment.class.getName());
+        mSettingsPreference.setPersistent(false);
+
         super.onViewCreated(view, savedInstanceState);
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index 3b786ff3107..bea528a788a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -18,6 +18,7 @@ package com.android.settings.accessibility;
 
 import android.app.settings.SettingsEnums;
 import android.os.Bundle;
+import android.view.View;
 
 public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
         extends ToggleScreenMagnificationPreferenceFragment {
@@ -42,4 +43,12 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
         }
         super.onStop();
     }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        // Hide the setting from the vision settings.
+        mSettingsPreference.setVisible(false);
+    }
 }