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

Commit b0b37ae2 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Help menus for several screens. 

Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
parent c1da7b10

res/menu/data_usage.xml

+3 −0
Original line number Diff line number Diff line
@@ -38,4 +38,7 @@ 
    <item

        android:id="@+id/data_usage_menu_metered"

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

    <item

        android:id="@+id/data_usage_menu_help"

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

</menu>

res/values/strings.xml

+25 −0
Original line number Diff line number Diff line
@@ -3941,4 +3941,29 @@ 
    <string name="app_notifications_switch_on">Enabled</string>

    <!-- Label for disabled state "notifications enabled" switch in app details [CHAR LIMIT=10] -->

    <string name="app_notifications_switch_off">Disabled</string>





    <!--  Help URLs for some screens. Not specified here. Specified in product overlays --><skip/>

    <!-- Help menu label [CHAR LIMIT=20] -->

    <string name="help_label">Help</string>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->

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

</resources>

src/com/android/settings/ChooseLockGeneric.java

+6 −0
Original line number Diff line number Diff line
@@ -377,5 +377,11 @@ public class ChooseLockGeneric extends PreferenceActivity { 
            }

            finish();

        }



        @Override

        protected int getHelpResource() {

            return R.string.help_url_choose_lockscreen;

        }



    }

}

src/com/android/settings/DataUsageSummary.java

+13 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.net.NetworkStats; 
import android.net.NetworkStatsHistory;

import android.net.NetworkTemplate;

import android.net.TrafficStats;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.INetworkManagementService;
@@ -478,6 +479,18 @@ public class DataUsageSummary extends Fragment { 
        } else {

            metered.setVisible(false);

        }



        final MenuItem help = menu.findItem(R.id.data_usage_menu_help);

        String helpUrl;

        if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_data_usage))) {

            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl));

            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

            help.setIntent(helpIntent);

            help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        } else {

            help.setVisible(false);

        }

    }



    @Override

src/com/android/settings/PrivacySettings.java

+5 −0
Original line number Diff line number Diff line
@@ -203,4 +203,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements 
        mAutoRestore.setEnabled(enable);

        mConfigure.setEnabled(enable);

    }



    @Override

    protected int getHelpResource() {

        return R.string.help_url_backup_reset;

    }

}