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

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

Snap for 5989078 from 7773a752 to qt-qpr2-release 

Change-Id: I0c7a82496717ae41b5e60fe472c94150dbc2869f
parents ab85c71b 7773a752

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -8961,6 +8961,14 @@ public final class Settings { 














        private static final Validator AWARE_LOCK_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**













         * Controls whether tap gesture is enabled.













         * @hide













         */













        public static final String TAP_GESTURE = "tap_gesture";

























        private static final Validator TAP_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**















         * This are the settings to be backed up.















         *










@@ -9294,6 +9302,7 @@ public final class Settings {













            VALIDATORS.put(AWARE_LOCK_ENABLED, AWARE_LOCK_ENABLED_VALIDATOR);















            VALIDATORS.put(AWARE_TAP_PAUSE_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);















            VALIDATORS.put(AWARE_TAP_PAUSE_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);













            VALIDATORS.put(TAP_GESTURE, TAP_GESTURE_VALIDATOR);















        }





























        /**

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -731,6 +731,7 @@ public class SettingsBackupTest {













                 Settings.Secure.SILENCE_GESTURE,















                 Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,















                 Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,













                 Settings.Secure.TAP_GESTURE,















                 Settings.Secure.FACE_UNLOCK_RE_ENROLL);































    @Test

































packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -22,6 +22,7 @@ import android.text.TextPaint;













import android.text.method.TransformationMethod;















import android.util.AttributeSet;















import android.util.Log;













import android.view.ContextThemeWrapper;















import android.view.LayoutInflater;















import android.view.View;















import android.view.ViewGroup;










@@ -238,13 +239,15 @@ public class SmartReplyView extends ViewGroup {













    public List<Button> inflateSmartActions(Context packageContext,















            @NonNull SmartActions smartActions, SmartReplyController smartReplyController,















            NotificationEntry entry, HeadsUpManager headsUpManager, boolean delayOnClickListener) {













        Context themedPackageContext = new ContextThemeWrapper(packageContext, mContext.getTheme());















        List<Button> buttons = new ArrayList<>();















        int numSmartActions = smartActions.actions.size();















        for (int n = 0; n < numSmartActions; n++) {















            Notification.Action action = smartActions.actions.get(n);















            if (action.actionIntent != null) {















                buttons.add(inflateActionButton(













                        this, getContext(), packageContext, n, smartActions, smartReplyController,













                        this, getContext(), themedPackageContext, n, smartActions,













                        smartReplyController,















                        entry, headsUpManager, delayOnClickListener));















            }















        }