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

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

Snap for 12053972 from 762d9a2c to 24Q4-release

Change-Id: I3285b27274be8d9cef4b71f081a468eed2284228
parents 8a613834 762d9a2c
Loading
Loading
Loading
Loading
+1435 −1382

File changed.

Preview size limit exceeded, changes collapsed.

+1473 −1457

File changed.

Preview size limit exceeded, changes collapsed.

+0 −10
Original line number Diff line number Diff line
@@ -183,16 +183,6 @@ public abstract class Vibrator {
        return getConfig().getDefaultVibrationIntensity(usage);
    }

    /**
     * Whether the keyboard vibration is enabled by default.
     *
     * @return {@code true} if the keyboard vibration is default enabled, {@code false} otherwise.
     * @hide
     */
    public boolean isDefaultKeyboardVibrationEnabled() {
        return getConfig().isDefaultKeyboardVibrationEnabled();
    }

    /**
     * Return the ID of this vibrator.
     *
+0 −13
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ public class VibrationConfig {
    @VibrationIntensity
    private final int mDefaultRingVibrationIntensity;

    private final boolean mDefaultKeyboardVibrationEnabled;

    private final boolean mKeyboardVibrationSettingsSupported;

    /** @hide */
@@ -87,8 +85,6 @@ public class VibrationConfig {

        mIgnoreVibrationsOnWirelessCharger = loadBoolean(resources,
                com.android.internal.R.bool.config_ignoreVibrationsOnWirelessCharger, false);
        mDefaultKeyboardVibrationEnabled = loadBoolean(resources,
                com.android.internal.R.bool.config_defaultKeyboardVibrationEnabled, true);
        mKeyboardVibrationSettingsSupported = loadBoolean(resources,
                com.android.internal.R.bool.config_keyboardVibrationSettingsSupported, false);

@@ -193,14 +189,6 @@ public class VibrationConfig {
        return mIgnoreVibrationsOnWirelessCharger;
    }

    /**
     * Whether keyboard vibration settings is enabled by default.
     * @hide
     */
    public boolean isDefaultKeyboardVibrationEnabled() {
        return mDefaultKeyboardVibrationEnabled;
    }

    /**
     * Whether the device support keyboard vibration settings.
     * @hide
@@ -248,7 +236,6 @@ public class VibrationConfig {
                + ", mDefaultMediaIntensity=" + mDefaultMediaVibrationIntensity
                + ", mDefaultNotificationIntensity=" + mDefaultNotificationVibrationIntensity
                + ", mDefaultRingIntensity=" + mDefaultRingVibrationIntensity
                + ", mDefaultKeyboardVibrationEnabled=" + mDefaultKeyboardVibrationEnabled
                + ", mKeyboardVibrationSettingsSupported=" + mKeyboardVibrationSettingsSupported
                + "}";
    }
+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.view.DisplayInfoProto.FLAGS;
import static android.view.DisplayInfoProto.LOGICAL_HEIGHT;
import static android.view.DisplayInfoProto.LOGICAL_WIDTH;
import static android.view.DisplayInfoProto.NAME;
import static android.view.DisplayInfoProto.TYPE;

import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -961,6 +962,7 @@ public final class DisplayInfo implements Parcelable {
        protoOutputStream.write(APP_HEIGHT, appHeight);
        protoOutputStream.write(NAME, name);
        protoOutputStream.write(FLAGS, flags);
        protoOutputStream.write(TYPE, type);
        if (displayCutout != null) {
            displayCutout.dumpDebug(protoOutputStream, CUTOUT);
        }
Loading