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

Commit c0e0262f authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename SubSettingLauncher.setTitle, add java doc"

parents 7ce6ba52 e86eec0c

src/com/android/settings/MasterClear.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 
        new SubSettingLauncher(getContext())

                .setDestination(MasterClearConfirm.class.getName())

                .setArguments(args)

                .setTitle(R.string.master_clear_confirm_title)

                .setTitleRes(R.string.master_clear_confirm_title)

                .setSourceMetricsCategory(getMetricsCategory())

                .launch();

    }

src/com/android/settings/ResetNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class ResetNetwork extends InstrumentedFragment { 
        new SubSettingLauncher(getContext())

                .setDestination(ResetNetworkConfirm.class.getName())

                .setArguments(args)

                .setTitle(R.string.reset_network_confirm_title)

                .setTitleRes(R.string.reset_network_confirm_title)

                .setSourceMetricsCategory(getMetricsCategory())

                .launch();

    }

src/com/android/settings/SettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
                .setSourceMetricsCategory(caller instanceof Instrumentable

                        ? ((Instrumentable) caller).getMetricsCategory()

                        : Instrumentable.METRICS_CATEGORY_UNKNOWN)

                .setTitle(-1)

                .setTitleRes(-1)

                .launch();

        return true;

    }

src/com/android/settings/accounts/AccountPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
                new SubSettingLauncher(mContext)

                        .setSourceMetricsCategory(mParent.getMetricsCategory())

                        .setDestination(ManagedProfileSettings.class.getName())

                        .setTitle(R.string.managed_profile_settings_title)

                        .setTitleRes(R.string.managed_profile_settings_title)

                        .setArguments(arguments)

                        .launch();

src/com/android/settings/accounts/AccountSyncPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class AccountSyncPreferenceController extends AbstractPreferenceControlle 
                .setDestination(AccountSyncSettings.class.getName())

                .setArguments(args)

                .setSourceMetricsCategory( MetricsProto.MetricsEvent.ACCOUNT)

                .setTitle( R.string.account_sync_title)

                .setTitleRes( R.string.account_sync_title)

                .launch();



        return true;