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

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

Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into... 

Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09cee am: 903293aa

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

Change-Id: I8558d9e58a9ff86d5ce4df95e551b350fc5a02d6
parents 56d0ee90 903293aa

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -5197,7 +5197,7 @@ 
    <string name="allow_bind_app_widget_activity_allow_bind_title">Create widget and allow access?</string>









    <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->









    <string name="allow_bind_app_widget_activity_allow_bind">After you create the widget, <xliff:g id="widget_host_name">%1$s</xliff:g> can access all data it displays.</string>









    <string name="allow_bind_app_widget_activity_allow_bind">After you create the widget, the application can access everything displayed.\n\nApplication: <xliff:g id="widget_host_name">%1$s</xliff:g>\nWidget: <xliff:g id="widget_label">%2$s</xliff:g>\n</string>

















    <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->









    <string name="allow_bind_app_widget_activity_always_allow_bind">Always allow <xliff:g id="widget_host_name">%1$s</xliff:g> to create widgets and access their data</string>

























src/com/android/settings/AllowBindAppWidgetActivity.java



+20
−4






























Original line number
Diff line number
Diff line







@@ -19,6 +19,7 @@ package com.android.settings;







import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



















import android.appwidget.AppWidgetManager;









import android.appwidget.AppWidgetProviderInfo;









import android.content.ComponentName;









import android.content.Context;









import android.content.DialogInterface;








@@ -122,9 +123,12 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements







                return;









            }









        }









        mAppWidgetManager = AppWidgetManager.getInstance(this);









        final String widgetLabel = getWidgetLabel();









        AlertController.AlertParams ap = mAlertParams;









        ap.mTitle = getString(R.string.allow_bind_app_widget_activity_allow_bind_title);









        ap.mMessage = getString(R.string.allow_bind_app_widget_activity_allow_bind, label);









        ap.mMessage = getString(R.string.allow_bind_app_widget_activity_allow_bind, label,









                widgetLabel);









        ap.mPositiveButtonText = getString(R.string.create);









        ap.mNegativeButtonText = getString(android.R.string.cancel);









        ap.mPositiveButtonListener = this;








@@ -133,18 +137,30 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements







                (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);









        ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null);









        mAlwaysUse = (CheckBox) ap.mView.findViewById(com.android.internal.R.id.alwaysUse);









        mAlwaysUse.setText(getString(R.string.allow_bind_app_widget_activity_always_allow_bind, label));









        mAlwaysUse.setText(









                getString(R.string.allow_bind_app_widget_activity_always_allow_bind, label));



















        mAlwaysUse.setPadding(mAlwaysUse.getPaddingLeft(),









                mAlwaysUse.getPaddingTop(),









                mAlwaysUse.getPaddingRight(),









                (int) (mAlwaysUse.getPaddingBottom() +









                        getResources().getDimension(R.dimen.bind_app_widget_dialog_checkbox_bottom_padding)));









                        getResources().getDimension(









                                R.dimen.bind_app_widget_dialog_checkbox_bottom_padding)));



















        mAppWidgetManager = AppWidgetManager.getInstance(this);









        mAlwaysUse.setChecked(mAppWidgetManager.hasBindAppWidgetPermission(mCallingPackage,









                mProfile.getIdentifier()));



















        setupAlert();









    }



















    private String getWidgetLabel() {









        String label = "";









        for (AppWidgetProviderInfo providerInfo : mAppWidgetManager.getInstalledProviders()) {









            if (providerInfo.provider.equals(mComponentName)) {









                label = providerInfo.loadLabel(getPackageManager());









                break;









            }









        }









        return label;









    }









}