Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c15b4069 authored by Danesh M's avatar Danesh M Committed by Gerrit Code Review
Browse files

Settings : Filter livelockscreen, button for secondary users 

Secondary users should not be able to configure either of those.

OPO-696

Change-Id: I43409c090fb12df576c29297fb506c70e6583bce
parent d135b55b

src/com/android/settings/ButtonSettings.java

+8 −8
Original line number Diff line number Diff line
@@ -407,8 +407,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
        try {

            // Only show the navigation bar category on devices that have a navigation bar

            // unless we are forcing it via development settings

            boolean forceNavbar = CMSettings.Secure.getInt(getContentResolver(),

                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) == 1;

            boolean forceNavbar = CMSettings.Global.getInt(getContentResolver(),

                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) == 1;

            boolean hasNavBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar()

                    || forceNavbar;
@@ -628,13 +628,13 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
    }



    private static void writeDisableNavkeysOption(Context context, boolean enabled) {

        CMSettings.Secure.putInt(context.getContentResolver(),

                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);

        CMSettings.Global.putInt(context.getContentResolver(),

                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);

    }



    private void updateDisableNavkeysOption() {

        boolean enabled = CMSettings.Secure.getInt(getActivity().getContentResolver(),

                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0;

        boolean enabled = CMSettings.Global.getInt(getActivity().getContentResolver(),

                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) != 0;



        mDisableNavigationKeys.setChecked(enabled);

    }
@@ -687,8 +687,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
            return;

        }



        writeDisableNavkeysOption(context, CMSettings.Secure.getInt(context.getContentResolver(),

                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0);

        writeDisableNavkeysOption(context, CMSettings.Global.getInt(context.getContentResolver(),

                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) != 0);

    }

src/com/android/settings/SecuritySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            // Add live lock screen preference if supported

            PreferenceGroup generalCategory = (PreferenceGroup)

                    root.findPreference(KEY_GENERAL_CATEGORY);

            if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null) {

            if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null && Utils.isUserOwner()) {

                boolean moveToTop = getResources().getBoolean(

                        R.bool.config_showLiveLockScreenSettingsFirst);

src/com/android/settings/SettingsActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ public class SettingsActivity extends Activity 
            R.id.home_settings,

            R.id.dashboard,

            R.id.privacy_settings_cyanogenmod,

            R.id.button_settings

    };



    private static final String[] ENTRY_FRAGMENTS = {