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

Commit f044095c authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Settings: Make CM Settings visible for users other than the owner" into cm-11.0

parents 178e49e6 43cafa19

res/xml/settings_headers.xml

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ 
        android:icon="@drawable/empty_icon" />



    <!-- INTERFACE -->

    <header android:title="@string/header_category_interface" />

    <header android:id="@+id/interface_section"

        android:title="@string/header_category_interface" />



    <!-- Home -->

    <header

src/com/android/settings/Settings.java

+6 −1
Original line number Diff line number Diff line
@@ -171,7 +171,12 @@ public class Settings extends PreferenceActivity 
            R.id.accessibility_settings,

            R.id.print_settings,

            R.id.nfc_payment_settings,

            R.id.home_settings

            R.id.home_settings,

            R.id.interface_section,

            R.id.lock_screen_settings,

            R.id.system_settings,

            R.id.privacy_guard_manager,

            R.id.button_settings

    };



    private SharedPreferences mDevelopmentPreferences;