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

Commit 613b6045 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "SettingsProvider: Allow disabling immersive mode confirmation for specific packages"

parents b859449b c02c4a7c

packages/SettingsProvider/res/values/defaults.xml

+6 −0
Original line number Diff line number Diff line
@@ -173,4 +173,10 @@ 
         0 means no timeout; battery sounds will always play

         >0 is milliseconds of screen-off time after which battery sounds will not play -->

    <integer name="def_low_battery_sound_timeout">0</integer>



    <!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting,

         which is a comma separated list of packages that no longer need confirmation

         for immersive mode.

         Override to disable immersive mode confirmation for certain packages. -->

    <string name="def_immersive_mode_confirmations" translatable="false"></string>

</resources>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -2111,6 +2111,10 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


            loadBooleanSetting(stmt, Settings.Secure.USER_SETUP_COMPLETE,

                    R.bool.def_user_setup_complete);



            loadStringSetting(stmt, Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,

                        R.string.def_immersive_mode_confirmations);



        } finally {

            if (stmt != null) stmt.close();

        }