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

Commit f58e5c22 authored by William Leshner's avatar William Leshner Committed by Android (Google) Code Review
Browse files

Merge "Add a config to gate "restrict to wireless charging" settings." into main

parents bb7b68af 4ccb5c6b

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -718,6 +718,10 @@ 
    <!-- Whether to show communal settings at the top level on mobile. -->

    <bool name="config_show_communal_settings_mobile">false</bool>



    <!-- Whether to show a "restrict to wireless charging" settings option in screensaver and hub

         mode settings (false by default). -->

    <bool name="config_show_restrict_to_wireless_charging">false</bool>



    <!-- The extra value for battery tip -->

    <integer name="config_battery_extra_tip_value">12</integer>

src/com/android/settings/communal/WhenToStartHubPicker.java

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class WhenToStartHubPicker extends RadioButtonPickerFragment { 
    private static final String SHOW_NEVER = "never";



    private Context mContext;

    private boolean mShowRestrictToWirelessCharging;



    @Nullable

    private RadioButtonPickerExtraSwitchController mRestrictToWirelessChargingController = null;
@@ -83,6 +84,8 @@ public class WhenToStartHubPicker extends RadioButtonPickerFragment { 
        super.onAttach(context);



        mContext = context;

        mShowRestrictToWirelessCharging =

                getResources().getBoolean(R.bool.config_show_restrict_to_wireless_charging);

    }



    @Override
@@ -116,7 +119,7 @@ public class WhenToStartHubPicker extends RadioButtonPickerFragment { 


    @Override

    protected void addStaticPreferences(PreferenceScreen screen) {

        if (mRestrictToWirelessChargingController == null) {

        if (mShowRestrictToWirelessCharging && mRestrictToWirelessChargingController == null) {

            mRestrictToWirelessChargingController =

                    new RadioButtonPickerExtraSwitchController(

                            mContext,

src/com/android/settings/dream/WhenToDreamPicker.java

+4 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment { 
    private Context mContext;

    private DreamBackend mBackend;

    private boolean mDreamsSupportedOnBattery;

    private boolean mShowRestrictToWirelessCharging;

    private RadioButtonPickerExtraSwitchController mRestrictToWirelessChargingController;



    private final RadioButtonPickerExtraSwitchController.PreferenceAccessor
@@ -64,6 +65,8 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment { 
        mBackend = DreamBackend.getInstance(context);

        mDreamsSupportedOnBattery = getResources().getBoolean(

                com.android.internal.R.bool.config_dreamsEnabledOnBattery);

        mShowRestrictToWirelessCharging =

                getResources().getBoolean(R.bool.config_show_restrict_to_wireless_charging);

    }



    @Override
@@ -104,7 +107,7 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment { 
            return;

        }



        if (mRestrictToWirelessChargingController == null) {

        if (mShowRestrictToWirelessCharging && mRestrictToWirelessChargingController == null) {

            mRestrictToWirelessChargingController =

                    new RadioButtonPickerExtraSwitchController(

                            mContext,