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

Commit 4031bc78 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "settings_presubmit_instr_test" 

* changes:
  Refactor help menu stuff into a controller
  Fix UniquePreferenceTest
parents ef48f651 e0b0e9f9

res/xml/zen_mode_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 


    <!-- Turn on DND button -->

    <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->

    <PreferenceCategory>

    <PreferenceCategory

        android:key="zen_mode_settings_button_category">

        <com.android.settings.applications.LayoutPreference

            android:key="zen_mode_settings_button_container"

            android:selectable="false"

src/com/android/settings/DeviceInfoSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
    }



    @Override

    protected int getHelpResource() {

    public int getHelpResource() {

        return R.string.help_uri_about;

    }

src/com/android/settings/DisplaySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class DisplaySettings extends DashboardFragment { 
    }



    @Override

    protected int getHelpResource() {

    public int getHelpResource() {

        return R.string.help_uri_display;

    }

src/com/android/settings/IccLockSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ public class IccLockSettings extends SettingsPreferenceFragment 
    }



    @Override

    protected int getHelpResource() {

    public int getHelpResource() {

        return R.string.help_url_icc_lock;

    }

src/com/android/settings/PrivacySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class PrivacySettings extends SettingsPreferenceFragment { 
    }



    @Override

    protected int getHelpResource() {

    public int getHelpResource() {

        return R.string.help_url_backup_reset;

    }