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

Commit 1a115d3e authored by Nikhil Kumar's avatar Nikhil Kumar
Browse files

Toast warning message when non-admin user tries to open dev options. 

Developer Settings are only accessible for the Admin users. Added a new toast warning message to be displayed when a non-admin user tries to open the Developer options.

Bug: 259941142
Test: Manually verfied by tapping on the USB debugging option from a Secondary user.
Change-Id: Ibd1b8e19d9130982982ee13ac98cbc1d8f5b8835
parent 306df3be

res/values/strings.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -41,9 +41,13 @@ 
    <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->

    <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->

    <string name="show_dev_already">No need, you are already a developer.</string>

    <string name="show_dev_already">No need, you are already a developer.</string>











    <!-- [CHAR LIMIT=NONE] Toast message when user attemps to launch developer otions before enabling it. -->




    <!-- [CHAR LIMIT=NONE] Toast message when user attempts to launch developer options before enabling it. -->








    <string name="dev_settings_disabled_warning">Please enable developer options first.</string>




    <string name="dev_settings_disabled_warning">Please enable developer options first.</string>




















    <!-- [CHAR LIMIT=NONE] Toast message when non-admin user attempts to launch developer options. -->










    <string name="dev_settings_available_to_admin_only_warning">Only the admin users can access developer settings.</string>


























    <!-- Category headings in left-pane header menu --> <skip />




    <!-- Category headings in left-pane header menu --> <skip />








    <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->




    <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->








    <string name="header_category_system">System</string>




    <string name="header_category_system">System</string>
































src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+8
−1






























Original line number
Original line
Diff line number
Diff line







@@ -233,7 +233,14 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra






            return;




            return;








        }




        }








        Context context = requireContext();




        Context context = requireContext();








        if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) {




        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);





















        if (!um.isAdminUser()) {










            Toast.makeText(context, R.string.dev_settings_available_to_admin_only_warning,










                            Toast.LENGTH_SHORT)










                    .show();










            finish();










        } else if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) {








            Toast.makeText(context, R.string.dev_settings_disabled_warning, Toast.LENGTH_SHORT)




            Toast.makeText(context, R.string.dev_settings_disabled_warning, Toast.LENGTH_SHORT)








                    .show();




                    .show();








            finish();




            finish();