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

Commit 18c44c5b authored by Daniel Sheng's avatar Daniel Sheng Committed by Android (Google) Code Review
Browse files

Merge "Changed camera lift trigger to default-on."

parents 2e59523c 834e5728

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -6780,6 +6780,13 @@ public final class Settings { 
         */

        public static final String CAMERA_LIFT_TRIGGER_ENABLED = "camera_lift_trigger_enabled";



        /**

         * The default enable state of the camera lift trigger.

         *

         * @hide

         */

        public static final int CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT = 1;



        /**

         * Whether the assist gesture should be enabled.

         *

services/core/java/com/android/server/GestureLauncherService.java

+2 −1
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ public class GestureLauncherService extends SystemService { 
    public static boolean isCameraLiftTriggerSettingEnabled(Context context, int userId) {

        return isCameraLiftTriggerEnabled(context.getResources())

                && (Settings.Secure.getIntForUser(context.getContentResolver(),

                        Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0, userId) != 0);

                        Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED,

                        Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT, userId) != 0);

    }



    /**