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

Commit cdea079f authored by Brian Quezada's avatar Brian Quezada Committed by Automerger Merge Worker
Browse files

Merge "Use config.xml for Flip to Screen Off." into sc-dev am: 7206a574 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161600

Change-Id: I9e02bc977e9425495b67ea81b15e2618b0f6ea6c
parents cbe6215b 7206a574

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1772,6 +1772,9 @@ 
        <!-- Add algorithm here -->

    </string-array>



    <!-- Boolean indicating if placing the phone face down will result in a screen off. -->

    <bool name="config_flipToScreenOffEnabled">true</bool>



    <!-- Boolean indicating if current platform supports bluetooth SCO for off call

    use cases -->

    <bool name="config_bluetooth_sco_off_call">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ 
  <java-symbol type="bool" name="action_bar_expanded_action_views_exclusive" />

  <java-symbol type="bool" name="config_avoidGfxAccel" />

  <java-symbol type="bool" name="config_bluetooth_address_validation" />

  <java-symbol type="bool" name="config_flipToScreenOffEnabled" />

  <java-symbol type="bool" name="config_bluetooth_sco_off_call" />

  <java-symbol type="bool" name="config_bluetooth_le_peripheral_mode_supported" />

  <java-symbol type="bool" name="config_bluetooth_hfp_inband_ringing_support" />

services/core/java/com/android/server/power/FaceDownDetector.java

+3 −1
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@ public class FaceDownDetector implements SensorEventListener { 


    private boolean isEnabled() {

        return DeviceConfig.getBoolean(NAMESPACE_ATTENTION_MANAGER_SERVICE, KEY_FEATURE_ENABLED,

                DEFAULT_FEATURE_ENABLED);

                DEFAULT_FEATURE_ENABLED)

                && mContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_flipToScreenOffEnabled);

    }



    private float getAccelerationThreshold() {