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

Commit fff7e807 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5709975 from 0e5c34bb to qt-c2f2-release 

Change-Id: If89cfb793fe22c372e188d3131632deb21d75925
parents 1e5588af 0e5c34bb

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2312,6 +2312,7 @@ package android.provider { 
  }



  public static interface DeviceConfig.WindowManager {

    field public static final String KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE = "system_gestures_excluded_by_pre_q_sticky_immersive";

    field public static final String KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP = "system_gesture_exclusion_limit_dp";

  }

core/java/android/provider/DeviceConfig.java

+11 −0
Original line number Diff line number Diff line
@@ -325,6 +325,17 @@ public final class DeviceConfig { 
         */

        @TestApi

        String KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP = "system_gesture_exclusion_limit_dp";



        /**

         * Key for controlling whether system gestures are implicitly excluded by windows requesting

         * sticky immersive mode from apps that are targeting an SDK prior to Q.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_WINDOW_MANAGER

         * @hide

         */

        @TestApi

        String KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE =

                "system_gestures_excluded_by_pre_q_sticky_immersive";

    }



    private static final Object sLock = new Object();

core/res/res/anim/lock_screen_behind_enter_subtle.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ 
        android:fromAlpha="0.0" android:toAlpha="1.0"

        android:fillEnabled="true" android:fillBefore="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="80"

        android:duration="233"/>

    <translate android:fromYDelta="5%p" android:toYDelta="0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/fast_out_slow_in"

            android:startOffset="80"

            android:duration="233" />

</set>
 
 No newline at end of file

packages/SettingsLib/res/values-en-rAU/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ 
    <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>

    <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string>

    <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>

    <string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge right now"</string>

    <string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge at the moment"</string>

    <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>

    <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Controlled by admin"</string>

    <string name="disabled" msgid="9206776641295849915">"Disabled"</string>

packages/SettingsLib/res/values-en-rCA/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ 
    <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>

    <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string>

    <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>

    <string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge right now"</string>

    <string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge at the moment"</string>

    <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>

    <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Controlled by admin"</string>

    <string name="disabled" msgid="9206776641295849915">"Disabled"</string>