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

Commit 756b3fbe authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add a config for "wake screen on notifications"." into... 

Merge "Merge "Add a config for "wake screen on notifications"." into tm-qpr-dev am: 19e7b945" into tm-qpr-dev-plus-aosp am: dfc06deb

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



Change-Id: I1685924d3538a0fbcf2f57872b06b3763da0058b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a971545b dfc06deb

core/java/android/hardware/display/AmbientDisplayConfiguration.java

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public class AmbientDisplayConfiguration { 


    /** @hide */

    public boolean pulseOnNotificationAvailable() {

        return ambientDisplayAvailable();

        return mContext.getResources().getBoolean(R.bool.config_pulseOnNotificationsAvailable)

                && ambientDisplayAvailable();

    }



    /** @hide */

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -5827,4 +5827,7 @@ 
    <string-array name="config_serviceStateLocationAllowedPackages">

        <item>"com.android.phone"</item>

    </string-array>



    <!-- Whether the wake screen on notifications feature is available. -->

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

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3338,6 +3338,7 @@ 
  <java-symbol type="string" name="config_dozeTapSensorType" />

  <java-symbol type="array" name="config_dozeTapSensorPostureMapping" />

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

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



  <!-- Used for MimeIconUtils. -->

  <java-symbol type="drawable" name="ic_doc_apk" />