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

Commit c6ca314c authored by Fan Zhang's avatar Fan Zhang
Browse files

Log source with visibility change 

- Add a method in VisibilityLoggerMixin to log visible event using
  LogMaker, which allows logging additional FIELD_CONTEXT field.
- In Utils.startFragment, add current page's metricsCategory as an extra
  to next page.
- In next page's onResume(), extract the previous page's metricsCategory
  and send it to VisibilityLoggerMixin.visible()
- Update all caller with additional paramters

Change-Id: I8e1f2597fa465b7d3aa16fa1d21c052a3219694a
Fix: 35359289
Test: RunSettingsRoboTests
parent 358eab0f

res/xml/development_prefs.xml

+3 −1
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ 
        <!-- hiding for now.

        <Preference

                android:key="background_check"

                android:fragment="com.android.settings.applications.BackgroundCheckSummary"

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

        -->
@@ -410,7 +411,8 @@ 


        <Preference

                android:key="inactive_apps"

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

                android:title="@string/inactive_apps_title"

                android:fragment="com.android.settings.fuelgauge.InactiveApps"/>



        <SwitchPreference

            android:key="force_allow_on_external"

src/com/android/settings/AppHeader.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.view.ViewGroup; 
import android.widget.ImageView;

import android.widget.TextView;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.applications.InstalledAppDetails;
@@ -88,7 +89,7 @@ public class AppHeader { 
                    if (includeAppInfo) {

                        AppInfoBase.startAppInfoFragment(InstalledAppDetails.class,

                                R.string.application_info_label, pkgName, uid, activity,

                                INSTALLED_APP_DETAILS);

                                INSTALLED_APP_DETAILS, MetricsProto.MetricsEvent.VIEW_UNKNOWN);

                    } else {

                        activity.finish();

                    }

src/com/android/settings/DevelopmentSettings.java

+2 −17
Original line number Diff line number Diff line
@@ -567,7 +567,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    void addDashboardCategoryPreferences() {

        final PreferenceScreen screen = getPreferenceScreen();

        final List<Preference> tilePrefs = mDashboardFeatureProvider.getPreferencesForCategory(

                getActivity(), getPrefContext(), CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

                getActivity(), getPrefContext(), getMetricsCategory(),

                CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        if (tilePrefs != null) {

            for (Preference preference : tilePrefs) {

                screen.addPreference(preference);
@@ -2469,10 +2470,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            writeUSBAudioOptions();

        } else if (preference == mForceResizable) {

            writeForceResizableOptions();

        } else if (INACTIVE_APPS_KEY.equals(preference.getKey())) {

            startInactiveAppsFragment();

        } else if (BACKGROUND_CHECK_KEY.equals(preference.getKey())) {

            startBackgroundCheckFragment();

        } else if (preference == mBluetoothDisableAbsVolume) {

            writeBluetoothDisableAbsVolumeOptions();

        } else if (preference == mWebViewMultiprocess) {
@@ -2486,18 +2483,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        return false;

    }



    private void startInactiveAppsFragment() {

        ((SettingsActivity) getActivity()).startPreferencePanel(

                InactiveApps.class.getName(),

                null, R.string.inactive_apps_title, null, null, 0);

    }



    private void startBackgroundCheckFragment() {

        ((SettingsActivity) getActivity()).startPreferencePanel(

                BackgroundCheckSummary.class.getName(),

                null, R.string.background_check_title, null, null, 0);

    }



    private boolean showKeyguardConfirmation(Resources resources, int requestCode) {

        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(

                requestCode, resources.getString(R.string.oem_unlock_enable));

src/com/android/settings/MasterClear.java

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ public class MasterClear extends OptionsMenuFragment 
    private void showFinalConfirmation() {

        Bundle args = new Bundle();

        args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());

        ((SettingsActivity) getActivity()).startPreferencePanel(MasterClearConfirm.class.getName(),

        ((SettingsActivity) getActivity()).startPreferencePanel(

                this, MasterClearConfirm.class.getName(),

                args, R.string.master_clear_confirm_title, null, null, 0);

    }

src/com/android/settings/ResetNetwork.java

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ public class ResetNetwork extends OptionsMenuFragment { 
            SubscriptionInfo subscription = mSubscriptions.get(selectedIndex);

            args.putInt(PhoneConstants.SUBSCRIPTION_KEY, subscription.getSubscriptionId());

        }

        ((SettingsActivity) getActivity()).startPreferencePanel(ResetNetworkConfirm.class.getName(),

        ((SettingsActivity) getActivity()).startPreferencePanel(

                this, ResetNetworkConfirm.class.getName(),

                args, R.string.reset_network_confirm_title, null, null, 0);

    }