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

Commit da5646b2 authored by Fang Yunong's avatar Fang Yunong Committed by Linux Build Service Account
Browse files

Implement an menu to start MyAccount 

Insert an menu in Backup && Reset named Collect Diagnostics
for sending start intent about MyAccount and develop a config
to show/unshow.

CRs-Fixed: 1039368
Change-Id: I30811322ab095e88e2a26dae5744874cb55122f4
parent 4bbee19c

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -78,4 +78,6 @@ 
    <bool name="config_regional_wifi_calling_notificaion_enable">false</bool>

    <bool name="wifi_call_enhanced_setting">false</bool>



    <!-- Config to show/hide Collect and diagnostics Preference UI option -->

    <bool name="config_collect_diagnostics_enabled">false</bool>

</resources>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -7574,4 +7574,6 @@ 
    <string name="turn_on_wifi_dialog_text">Wi-Fi is turned off when Mobile HotSpot is active. To turn on Wi-Fi, please turn off Mobile HotSpot.</string>

    <string name="dialog_not_show_again">Do not show again</string>

    <string name="tethering_settings_summary">Share your device\'s mobile data connection via USB or a Mobile HotSpot</string>

    <string name="collect_diagnostics_title">Collect Diagnostics</string>

    <string name="collect_diagnostics_summary">Collect diagnostics data for troubleshooting</string>

</resources>

res/xml/privacy_settings.xml

+11 −0
Original line number Diff line number Diff line
@@ -68,4 +68,15 @@ 
        settings:useAdminDisabledSummary="true"

        android:fragment="com.android.settings.MasterClear" />





    <!-- Collect Diagnostics -->

    <PreferenceScreen

        android:key="collect_diagnostics"

        android:title="@string/collect_diagnostics_title"

        android:summary="@string/collect_diagnostics_summary">

        <intent

            android:action="com.metrics.tmobile.SUMMARY"

            android:targetPackage="com.tmobile.pr.mytmobile"

            android:targetClass="com.tmobile.pr.mytmobile.iqtoggle.ui.OptInSummary" />

    </PreferenceScreen>

</PreferenceScreen>

src/com/android/settings/PrivacySettings.java

+8 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index 
    private static final String BACKUP_INACTIVE = "backup_inactive";

    private static final String NETWORK_RESET = "network_reset";

    private static final String FACTORY_RESET = "factory_reset";

    private static final String COLLECT_DIAGNOSTICS = "collect_diagnostics";

    private static final String TAG = "PrivacySettings";

    private IBackupManager mBackupManager;

    private PreferenceScreen mBackup;
@@ -335,5 +336,12 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index 
                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {

            nonVisibleKeys.add(NETWORK_RESET);

        }

        if (!collectDiagnosticsEnabled(context)){

            nonVisibleKeys.add(COLLECT_DIAGNOSTICS);

        }

    }



    private static boolean collectDiagnosticsEnabled(Context context) {

        return context.getResources().getBoolean(R.bool.config_collect_diagnostics_enabled);

    }

}