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

Commit f839eb72 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9005101 from 69d314f2 to tm-qpr1-release 

Change-Id: I2a3e405eca45361dfd98472d67b8f882e36ab4e4
parents 6be11c94 69d314f2

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3403,6 +3403,7 @@ package android.window { 
    method @NonNull public android.window.WindowContainerTransaction reparentActivityToTaskFragment(@NonNull android.os.IBinder, @NonNull android.os.IBinder);

    method @NonNull public android.window.WindowContainerTransaction reparentChildren(@NonNull android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken);

    method @NonNull public android.window.WindowContainerTransaction reparentTasks(@Nullable android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken, @Nullable int[], @Nullable int[], boolean);

    method @NonNull public android.window.WindowContainerTransaction requestFocusOnTaskFragment(@NonNull android.os.IBinder);

    method @NonNull public android.window.WindowContainerTransaction scheduleFinishEnterPip(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

    method @NonNull public android.window.WindowContainerTransaction setActivityWindowingMode(@NonNull android.window.WindowContainerToken, int);

    method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken);

core/java/android/util/FeatureFlagUtils.java

+0 −8
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ public class FeatureFlagUtils { 
    /** @hide */

    public static final String SETTINGS_SUPPORT_LARGE_SCREEN = "settings_support_large_screen";



    /**

     * Support per app's language selection

     * @hide

     */

    public static final String SETTINGS_APP_LANGUAGE_SELECTION = "settings_app_language_selection";



    /**

     * Support locale opt-out and opt-in switch for per app's language.

     * @hide
@@ -110,7 +104,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true");

        DEFAULT_FLAGS.put(SETTINGS_SUPPORT_LARGE_SCREEN, "true");

        DEFAULT_FLAGS.put("settings_search_always_expand", "true");

        DEFAULT_FLAGS.put(SETTINGS_APP_LANGUAGE_SELECTION, "true");

        DEFAULT_FLAGS.put(SETTINGS_APP_LOCALE_OPT_IN_ENABLED, "true");

        DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "true");

        DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true");
@@ -121,7 +114,6 @@ public class FeatureFlagUtils { 
    private static final Set<String> PERSISTENT_FLAGS;

    static {

        PERSISTENT_FLAGS = new HashSet<>();

        PERSISTENT_FLAGS.add(SETTINGS_APP_LANGUAGE_SELECTION);

        PERSISTENT_FLAGS.add(SETTINGS_APP_LOCALE_OPT_IN_ENABLED);

        PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);

        PERSISTENT_FLAGS.add(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS);

core/java/android/widget/Switch.java

+24 −14
Original line number Diff line number Diff line
@@ -61,22 +61,32 @@ import android.widget.RemoteViews.RemoteView; 
import com.android.internal.R;



/**

 * A Switch is a two-state toggle switch widget that can select between two

 * options. The user may drag the "thumb" back and forth to choose the selected option,

 * or simply tap to toggle as if it were a checkbox. The {@link #setText(CharSequence) text}

 * property controls the text displayed in the label for the switch, whereas the

 * {@link #setTextOff(CharSequence) off} and {@link #setTextOn(CharSequence) on} text

 * controls the text on the thumb. Similarly, the

 * {@link #setTextAppearance(android.content.Context, int) textAppearance} and the related

 * setTypeface() methods control the typeface and style of label text, whereas the

 * {@link #setSwitchTextAppearance(android.content.Context, int) switchTextAppearance} and

 * the related setSwitchTypeface() methods control that of the thumb.

 * A Switch is a two-state toggle widget. Users can drag the switch "thumb" back

 * and forth to select either of two options or simply tap the switch to toggle

 * between options.

 *

 * <p>{@link androidx.recyclerview.widget.RecyclerView} is a version of

 * the Switch widget which runs on devices back to API 7.</p>

 * <p>The {@link #setText(CharSequence) text} property controls

 * the text of the switch label. The {@link #setTextOn(CharSequence) textOn} and

 * {@link #setTextOff(CharSequence) textOff} properties control the text of the

 * thumb. The {@link #setTextAppearance(int) textAppearance} property and the

 * related {@link #setTypeface(android.graphics.Typeface) setTypeface()} methods

 * control the typeface and style of the switch label. The

 * {@link #setSwitchTextAppearance(android.content.Context, int)

 * switchTextAppearance} property and the related

 * {@link #setSwitchTypeface(android.graphics.Typeface) setSwitchTypeface()}

 * methods control the typeface and style of the thumb text.</p>

 *

 * <p>See the <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a>

 * guide.</p>

 * <p class="note"><b>Note:</b> The thumb text is displayed only if the

 * <a href="{@docRoot}reference/android/widget/Switch#attr_android:showText">

 * <code>showText</code></a> attribute is set to {@code true}. See also

 * {@link #setShowText(boolean)} and {@link #getShowText()}.</p>

 *

 * <p>{@link androidx.appcompat.widget.SwitchCompat} provides backward

 * compatibility down to Android 4.0 (API level 14).</p>

 *

 * <p>For more information, see the

 * <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">

 * Toggle Buttons</a> guide.</p>

 *

 * @attr ref android.R.styleable#Switch_textOn

 * @attr ref android.R.styleable#Switch_textOff

core/java/android/window/WindowContainerTransaction.java

+0 −1
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ public final class WindowContainerTransaction implements Parcelable { 
     * TaskFragment.

     * @param fragmentToken client assigned unique token to create TaskFragment with specified in

     *                      {@link TaskFragmentCreationParams#getFragmentToken()}.

     * @hide

     */

    @NonNull

    public WindowContainerTransaction requestFocusOnTaskFragment(@NonNull IBinder fragmentToken) {

core/res/res/values/config.xml

+2 −3
Original line number Diff line number Diff line
@@ -1565,8 +1565,7 @@ 
    <bool name="config_enableIdleScreenBrightnessMode">false</bool>



    <!-- Array of desired screen brightness in nits corresponding to the lux values

         in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and

         config_screenBrightnessMaximumNits, the display brightness is defined as the measured

         in the config_autoBrightnessLevels array. The display brightness is defined as the measured

         brightness of an all-white image.



         If this is defined then:
@@ -1587,7 +1586,7 @@ 
    <array name="config_autoBrightnessDisplayValuesNitsIdle">

    </array>



    <!-- Array of output values for button backlight corresponding to the luX values

    <!-- Array of output values for button backlight corresponding to the lux values

         in the config_autoBrightnessLevels array.  This array should have size one greater

         than the size of the config_autoBrightnessLevels array.

         The brightness values must be between 0 and 255 and be non-decreasing.