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

Commit 3e3b75f2 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Add help menu for Users and Location access" into jb-mr1-dev

parents 05bf34c2 38223dc4

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -4257,6 +4257,10 @@ 
    <string name="help_url_tether" translatable="false"></string>

    <!-- Help URL, Dreams [DO NOT TRANSLATE] -->

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

    <!-- Help URL, User settings [DO NOT TRANSLATE] -->

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

    <!-- Help URL, Location access [DO NOT TRANSLATE] -->

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



    <!-- User account title [CHAR LIMIT=30] -->

    <string name="user_account_title">Account for content</string>

src/com/android/settings/LocationSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ public class LocationSettings extends SettingsPreferenceFragment 
        return true;

    }



    @Override

    public int getHelpResource() {

        return R.string.help_url_location_access;

    }

}



class WrappingSwitchPreference extends SwitchPreference {

src/com/android/settings/users/UserSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ public class UserSettings extends SettingsPreferenceFragment 
            removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM

                    | MenuItem.SHOW_AS_ACTION_WITH_TEXT);

        }

        super.onCreateOptionsMenu(menu, inflater);

    }



    @Override
@@ -524,4 +525,8 @@ public class UserSettings extends SettingsPreferenceFragment 
        return false;

    }



    @Override

    public int getHelpResource() {

        return R.string.help_url_users;

    }

}