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

Commit 674bb295 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev

parents cb27771f f31108f1

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -13747,8 +13747,8 @@ 
    <string name="lockscreen_double_line_clock_summary">Show double-line clock when available</string>

    <!-- Lockscreen double-line clock toggle [CHAR LIMIT=60] -->

    <string name="lockscreen_double_line_clock_setting_toggle">Double-line clock</string>

    <!-- Lock screen buttons preference [CHAR LIMIT=60] -->

    <string name="lockscreen_quick_affordances_title">Buttons</string>

    <!-- Lock screen shortcuts preference [CHAR LIMIT=60] -->

    <string name="lockscreen_quick_affordances_title">Shortcuts</string>

    <!-- Summary for the lock screen button preference [CHAR LIMIT=60] -->

    <plurals name="lockscreen_quick_affordances_summary">

        <item quantity="zero">None</item>

src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ public class CustomizableLockScreenQuickAffordancesPreferenceController extends 
        final Preference preference = screen.findPreference(getPreferenceKey());

        if (preference != null) {

            preference.setOnPreferenceClickListener(preference1 -> {

                // TODO(b/258471384): open the buttons destination within wallpaper picker.

                final Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER);

                final String packageName =

                        mContext.getString(R.string.config_wallpaper_picker_package);

                if (!TextUtils.isEmpty(packageName)) {

                    intent.setPackage(packageName);

                }

                intent.putExtra("destination", "quick_affordances");

                mContext.startActivity(intent);

                return true;

            });

tests/robotests/src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public class CustomizableLockScreenQuickAffordancesPreferenceControllerTest { 
        assertThat(intentCaptor.getValue().getPackage()).isEqualTo(

                mContext.getString(R.string.config_wallpaper_picker_package));

        assertThat(intentCaptor.getValue().getAction()).isEqualTo(Intent.ACTION_SET_WALLPAPER);

        assertThat(intentCaptor.getValue().getStringExtra("destination"))

                .isEqualTo("quick_affordances");

    }



    @Test