Settings: Make Perf settings act just like dev setting - start hidden

The Performance settings should not show until the owner of the
device enables development options, guest users should not be able
to turn it on.

Change-Id: Ib08d29bfd92ad44c71d02c115e12064ddf4704e0

2 files changed, 28 insertions, 24 deletions

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 76235ba..44dc638 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -206,35 +206,38 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
                 }
             }
         } else if (preference.getKey().equals(KEY_BUILD_NUMBER)) {
-            if (mDevHitCountdown > 0) {
-                mDevHitCountdown--;
-                if (mDevHitCountdown == 0) {
-                    getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
-                            Context.MODE_PRIVATE).edit().putBoolean(
-                                    DevelopmentSettings.PREF_SHOW, true).apply();
-                    if (mDevHitToast != null) {
-                        mDevHitToast.cancel();
+            // Only allow the owner of the device to turn on dev and performance options
+            if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
+                if (mDevHitCountdown > 0) {
+                    mDevHitCountdown--;
+                    if (mDevHitCountdown == 0) {
+                        getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                                Context.MODE_PRIVATE).edit().putBoolean(
+                                        DevelopmentSettings.PREF_SHOW, true).apply();
+                        if (mDevHitToast != null) {
+                            mDevHitToast.cancel();
+                        }
+                        mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_on,
+                                Toast.LENGTH_LONG);
+                        mDevHitToast.show();
+                    } else if (mDevHitCountdown > 0
+                            && mDevHitCountdown < (TAPS_TO_BE_A_DEVELOPER-2)) {
+                        if (mDevHitToast != null) {
+                            mDevHitToast.cancel();
+                        }
+                        mDevHitToast = Toast.makeText(getActivity(), getResources().getString(
+                                R.string.show_dev_countdown, mDevHitCountdown),
+                                Toast.LENGTH_SHORT);
+                        mDevHitToast.show();
                     }
-                    mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_on,
-                            Toast.LENGTH_LONG);
-                    mDevHitToast.show();
-                } else if (mDevHitCountdown > 0
-                        && mDevHitCountdown < (TAPS_TO_BE_A_DEVELOPER-2)) {
+                } else if (mDevHitCountdown < 0) {
                     if (mDevHitToast != null) {
                         mDevHitToast.cancel();
                     }
-                    mDevHitToast = Toast.makeText(getActivity(), getResources().getString(
-                            R.string.show_dev_countdown, mDevHitCountdown),
-                            Toast.LENGTH_SHORT);
+                    mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_already,
+                            Toast.LENGTH_LONG);
                     mDevHitToast.show();
                 }
-            } else if (mDevHitCountdown < 0) {
-                if (mDevHitToast != null) {
-                    mDevHitToast.cancel();
-                }
-                mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_already,
-                        Toast.LENGTH_LONG);
-                mDevHitToast.show();
             }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 4f92d2c..75943e0 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -473,7 +473,8 @@ public class Settings extends PreferenceActivity
                         || Utils.isMonkeyRunning()) {
                     target.remove(i);
                 }
-            } else if (id == R.id.development_settings) {
+            } else if (id == R.id.development_settings
+                    || id == R.id.performance_settings) {
                 if (!showDev) {
                     target.remove(i);
                 }