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

Commit 2eeb6316 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Menu unlock (frameworks part)" into ics

parents ad84e191 598e4159

policy/src/com/android/internal/policy/impl/LockScreen.java

+2 −1
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen { 
        final boolean configDisabled = res.getBoolean(R.bool.config_disableMenuKeyInLockScreen);

        final boolean isTestHarness = ActivityManager.isRunningInTestHarness();

        final boolean fileOverride = (new File(ENABLE_MENU_KEY_FILE)).exists();

        return !configDisabled || isTestHarness || fileOverride;

        final boolean menuOverride = Settings.System.getInt(getContext().getContentResolver(), Settings.System.MENU_UNLOCK_SCREEN, 0) == 1;

        return !configDisabled || isTestHarness || fileOverride || menuOverride;

    }



    /**