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

Commit 8744e4d3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a new string for widget configuration drop target" into sc-qpr1-dev am: 52c93d17 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15992145

Change-Id: Idd0abbec06c8aa1f06a2d11500f67ceebdd801db
parents b8ac4acf 52c93d17

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -200,8 +200,11 @@ 
    <!-- Error text that lets a user know that the widget can't load. -->

    <string name="gadget_error_text">Can\'t load widget</string>



    <!-- Button text. This button lets a user change a widget's settings. -->

    <string name="gadget_setup_text">Widget settings</string>



    <!-- Instructional text to encourage a user to finish setting up the widget. -->

    <string name="gadget_setup_text">Tap to finish setup</string>

    <string name="gadget_complete_setup_text">Tap to finish setup</string>



    <!-- Text to inform the user that they can't uninstall a system application -->

    <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string>

src/com/android/launcher3/widget/PendingAppWidgetHostView.java

+2 −2
Original line number Diff line number Diff line
@@ -268,8 +268,8 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView 
            if (availableWidth > 0) {

                // Recreate the setup text.

                mSetupTextLayout = new StaticLayout(

                        getResources().getText(R.string.gadget_setup_text), mPaint, availableWidth,

                        Layout.Alignment.ALIGN_CENTER, 1, 0, true);

                        getResources().getText(R.string.gadget_complete_setup_text), mPaint,

                        availableWidth, Layout.Alignment.ALIGN_CENTER, 1, 0, true);

                int textHeight = mSetupTextLayout.getHeight();



                // Extra icon size due to the setting icon