PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for widgets in user profiles

Browse Source 
bug:14991269

Change-Id: I7f71787bf5e5278230063b9d3bafac96a0680682
This commit is contained in:
Svet Ganov
2014-08-01 15:06:43 -07:00
committed by Svetoslav
parent 1f4049edfe
commit c15c0c078e
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/AllowBindAppWidgetActivity.java
View File

@@ -25,7 +25,7 @@ import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.DisplayMetrics; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.widget.CheckBox; import android.widget.CheckBox;
@@ -42,6 +42,7 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
private CheckBox mAlwaysUse; private CheckBox mAlwaysUse;
private int mAppWidgetId; private int mAppWidgetId;
private UserHandle mProfile;
private ComponentName mComponentName; private ComponentName mComponentName;
private String mCallingPackage; private String mCallingPackage;
private AppWidgetManager mAppWidgetManager; private AppWidgetManager mAppWidgetManager;
@@ -55,27 +56,32 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
if (mAppWidgetId != -1 && mComponentName != null && mCallingPackage != null) { if (mAppWidgetId != -1 && mComponentName != null && mCallingPackage != null) {
try { try {
mAppWidgetManager.bindAppWidgetId(mAppWidgetId, mComponentName); final boolean bound = mAppWidgetManager.bindAppWidgetIdIfAllowed(mAppWidgetId,
mProfile, mComponentName, null);
if (bound) {
Intent result = new Intent(); Intent result = new Intent();
result.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId); result.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
setResult(RESULT_OK, result); setResult(RESULT_OK, result);
}
} catch (Exception e) { } catch (Exception e) {
Log.v("BIND_APPWIDGET", "Error binding widget with id " Log.v("BIND_APPWIDGET", "Error binding widget with id "
+ mAppWidgetId + " and component " + mComponentName); + mAppWidgetId + " and component " + mComponentName);
} }
final boolean alwaysAllowBind = mAlwaysUse.isChecked();
if (alwaysAllowBind != mAppWidgetManager.hasBindAppWidgetPermission(
mCallingPackage)) {
mAppWidgetManager.setBindAppWidgetPermission(mCallingPackage,
alwaysAllowBind);
} }
boolean alwaysAllowBind = mAlwaysUse.isChecked();
if (alwaysAllowBind != mAppWidgetManager.hasBindAppWidgetPermission(mCallingPackage)) {
mAppWidgetManager.setBindAppWidgetPermission(mCallingPackage, alwaysAllowBind);
} }
} }
finish(); finish();
} }
protected void onDestroy() { protected void onPause() {
if (!mClicked) { if (isDestroyed() && !mClicked) {
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
finish();
} }
super.onDestroy(); super.onDestroy();
} }
@@ -87,7 +93,12 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
if (intent != null) { if (intent != null) {
try { try {
mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1); mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
mComponentName = (ComponentName) mProfile = intent.getParcelableExtra(
AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE);
if (mProfile == null) {
mProfile = android.os.Process.myUserHandle();
}
mComponentName =
intent.getParcelableExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER); intent.getParcelableExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER);
mCallingPackage = getCallingPackage(); mCallingPackage = getCallingPackage();
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
@@ -123,7 +134,8 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
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); mAppWidgetManager = AppWidgetManager.getInstance(this);
mAlwaysUse.setChecked(mAppWidgetManager.hasBindAppWidgetPermission(mCallingPackage)); mAlwaysUse.setChecked(mAppWidgetManager.hasBindAppWidgetPermission(mCallingPackage,
mProfile.getIdentifier()));
setupAlert(); setupAlert();
} }