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

Commit e1a9a564 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Update summary of Gesture" into rvc-dev

parents d9d9a9be cef1020f

src/com/android/settings/aware/AwareFeatureProvider.java

+4 −0
Original line number Diff line number Diff line
@@ -29,4 +29,8 @@ public interface AwareFeatureProvider { 


    /** Show information dialog. */

    void showRestrictionDialog(Fragment parent);



    /** Return Quick Gestures Summary. */

    CharSequence getGestureSummary(Context context, boolean sensorSupported,

            boolean assistGestureEnabled, boolean assistGestureSilenceEnabled);

}

src/com/android/settings/aware/AwareFeatureProviderImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -34,4 +34,10 @@ public class AwareFeatureProviderImpl implements AwareFeatureProvider { 
    @Override

    public void showRestrictionDialog(Fragment parent) {

    }



    @Override

    public CharSequence getGestureSummary(Context context, boolean sensorSupported,

            boolean assistGestureEnabled, boolean assistGestureSilenceEnabled) {

        return null;

    }

}

src/com/android/settings/gestures/GesturesSettingPreferenceController.java

+12 −1
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.hardware.display.AmbientDisplayConfiguration;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.annotation.NonNull;



import com.android.settings.R;

import com.android.settings.aware.AwareFeatureProvider;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.AbstractPreferenceController;
@@ -33,6 +35,7 @@ import java.util.List; 


public class GesturesSettingPreferenceController extends BasePreferenceController {

    private final AssistGestureFeatureProvider mFeatureProvider;

    private final AwareFeatureProvider mAwareFeatureProvider;

    private List<AbstractPreferenceController> mGestureControllers;



    private static final String KEY_GESTURES_SETTINGS = "gesture_settings";
@@ -41,6 +44,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle 
    public GesturesSettingPreferenceController(Context context) {

        super(context, KEY_GESTURES_SETTINGS);

        mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();

        mAwareFeatureProvider = FeatureFactory.getFactory(context).getAwareFeatureProvider();

    }



    @Override
@@ -90,8 +94,15 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle 
                contentResolver, Settings.Secure.ASSIST_GESTURE_ENABLED, 1) != 0;

        final boolean assistGestureSilenceEnabled = Settings.Secure.getInt(

                contentResolver, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;

        final boolean sensorSupported = mFeatureProvider.isSupported(mContext);



        if (mFeatureProvider.isSupported(mContext) && assistGestureEnabled) {

        final CharSequence awareSummary = mAwareFeatureProvider.getGestureSummary(mContext,

                sensorSupported, assistGestureEnabled, assistGestureSilenceEnabled);

        if (!TextUtils.isEmpty(awareSummary)) {

            return awareSummary;

        }



        if (sensorSupported && assistGestureEnabled) {

            return mContext.getText(

                    R.string.language_input_gesture_summary_on_with_assist);

        }