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

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

Snap for 6069307 from 98e8a9e3 to qt-qpr2-release

Change-Id: I336606049128a7e4b845ef3bb4657098959fc104
parents 344269e9 98e8a9e3
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -660,6 +660,22 @@ public final class Settings {
    public static final String ACTION_NIGHT_DISPLAY_SETTINGS =
            "android.settings.NIGHT_DISPLAY_SETTINGS";
    /**
     * Activity Action: Show settings to allow configuration of Dark theme.
     * <p>
     * In some cases, a matching Activity may not exist, so ensure you
     * safeguard against this.
     * <p>
     * Input: Nothing.
     * <p>
     * Output: Nothing.
     *
     * @hide
     */
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
    public static final String ACTION_DARK_THEME_SETTINGS =
            "android.settings.DARK_THEME_SETTINGS";
    /**
     * Activity Action: Show settings to allow configuration of locale.
     * <p>
+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ public final class FillWindow implements AutoCloseable {
        synchronized (mLock) {
            if (mDestroyed) return;
            if (mUpdateCalled) {
                mFillView.setOnClickListener(null);
                hide();
                mProxy.report(AutofillProxy.REPORT_EVENT_UI_DESTROYED);
            }
+17 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import java.util.concurrent.Executor;
 */
public abstract class CompositionSamplingListener {

    private final long mNativeListener;
    private long mNativeListener;
    private final Executor mExecutor;

    public CompositionSamplingListener(Executor executor) {
@@ -37,13 +37,19 @@ public abstract class CompositionSamplingListener {
        mNativeListener = nativeCreate(this);
    }

    @Override
    protected void finalize() throws Throwable {
        try {
            if (mNativeListener != 0) {
    public void destroy() {
        if (mNativeListener == 0) {
            return;
        }
        unregister(this);
        nativeDestroy(mNativeListener);
        mNativeListener = 0;
    }

    @Override
    protected void finalize() throws Throwable {
        try {
            destroy();
        } finally {
            super.finalize();
        }
@@ -59,6 +65,9 @@ public abstract class CompositionSamplingListener {
     */
    public static void register(CompositionSamplingListener listener,
            int displayId, IBinder stopLayer, Rect samplingArea) {
        if (listener.mNativeListener == 0) {
            return;
        }
        Preconditions.checkArgument(displayId == Display.DEFAULT_DISPLAY,
                "default display only for now");
        nativeRegister(listener.mNativeListener, stopLayer, samplingArea.left, samplingArea.top,
@@ -69,6 +78,9 @@ public abstract class CompositionSamplingListener {
     * Unregisters a sampling listener.
     */
    public static void unregister(CompositionSamplingListener listener) {
        if (listener.mNativeListener == 0) {
            return;
        }
        nativeUnregister(listener.mNativeListener);
    }

+7 −7
Original line number Diff line number Diff line
@@ -414,14 +414,14 @@ public class ResolverActivity extends Activity {
            mFooterSpacer.setLayoutParams(new AbsListView.LayoutParams(LayoutParams.MATCH_PARENT,
                                                                       mSystemWindowInsets.bottom));
            ((ListView) mAdapterView).addFooterView(mFooterSpacer);
        } else {
        }

        View emptyView = findViewById(R.id.empty);
        if (emptyView != null) {
            emptyView.setPadding(0, 0, 0, mSystemWindowInsets.bottom
                                 + getResources().getDimensionPixelSize(
                                         R.dimen.chooser_edge_margin_normal) * 2);
        }
        }

        return insets.consumeSystemWindowInsets();
    }
+2 −0
Original line number Diff line number Diff line
@@ -1138,6 +1138,8 @@
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permdesc_accessCoarseLocation" product="tv">This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when when the app is in the foreground. These location services must be turned on and available on your TV for the app to be able to use them.</string>
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permdesc_accessCoarseLocation" product="automotive">This app can get your approximate location only when it is in the foreground. These location services must be turned on and available on your car for the app to be able to use them.</string>
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
    <string name="permdesc_accessCoarseLocation" product="default">This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when the app is in the foreground. These location services must be turned on and available on your phone for the app to be able to use them.</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
Loading