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

Allowing rotation while adding lockscreen widgets

Browse Source 
Also cleaning up some unused code

Bug: 7468012
This commit is contained in:
Michael Jurka
2012-11-07 01:11:28 -08:00
parent a487bca470
commit f5336fd114
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/settings/KeyguardAppWidgetPickActivity.java
View File

@@ -84,7 +84,6 @@ public class KeyguardAppWidgetPickActivity extends Activity
private boolean mAddingToKeyguard = true; private boolean mAddingToKeyguard = true;
private Intent mResultData; private Intent mResultData;
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
private boolean mSuccess;
private Bundle mExtraConfigureOptions; private Bundle mExtraConfigureOptions;
@Override @Override
@@ -202,13 +201,9 @@ public class KeyguardAppWidgetPickActivity extends Activity
private PackageManager mPackageManager; private PackageManager mPackageManager;
private int mIconDpi; private int mIconDpi;
private ImageView mView; private ImageView mView;
private float mDensityScale;
public WidgetPreviewLoader(Context context, ImageView v) { public WidgetPreviewLoader(Context context, ImageView v) {
super(); super();
mResources = context.getResources(); mResources = context.getResources();
DisplayMetrics metrics = new DisplayMetrics();
((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(metrics);
mDensityScale = metrics.density;
mPackageManager = context.getPackageManager(); mPackageManager = context.getPackageManager();
ActivityManager activityManager = ActivityManager activityManager =
(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
@@ -298,7 +293,6 @@ public class KeyguardAppWidgetPickActivity extends Activity
RectCache sCachedAppWidgetPreviewSrcRect = new RectCache(); RectCache sCachedAppWidgetPreviewSrcRect = new RectCache();
RectCache sCachedAppWidgetPreviewDestRect = new RectCache(); RectCache sCachedAppWidgetPreviewDestRect = new RectCache();
PaintCache sCachedAppWidgetPreviewPaint = new PaintCache(); PaintCache sCachedAppWidgetPreviewPaint = new PaintCache();
private final float sWidgetPreviewIconPaddingPercentage = 0.25f;
private Bitmap getWidgetPreview(ComponentName provider, int previewImage, private Bitmap getWidgetPreview(ComponentName provider, int previewImage,
int iconId, int maxWidth, int maxHeight) { int iconId, int maxWidth, int maxHeight) {
@@ -533,6 +527,11 @@ public class KeyguardAppWidgetPickActivity extends Activity
setResultData(result, intent); setResultData(result, intent);
} else { } else {
try { try {
if (mAddingToKeyguard && mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
// Found in KeyguardHostView.java
final int KEYGUARD_HOST_ID = 0x4B455947;
mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID);
}
mAppWidgetManager.bindAppWidgetId( mAppWidgetManager.bindAppWidgetId(
mAppWidgetId, intent.getComponent(), mExtraConfigureOptions); mAppWidgetId, intent.getComponent(), mExtraConfigureOptions);
result = RESULT_OK; result = RESULT_OK;
@@ -554,10 +553,6 @@ public class KeyguardAppWidgetPickActivity extends Activity
} }
protected void onDestroy() { protected void onDestroy() {
if (!mSuccess && mAddingToKeyguard &&
mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId);
}
if (mAppWidgetAdapter != null) { if (mAppWidgetAdapter != null) {
mAppWidgetAdapter.cancelAllWidgetPreviewLoaders(); mAppWidgetAdapter.cancelAllWidgetPreviewLoaders();
} }
@@ -568,20 +563,20 @@ public class KeyguardAppWidgetPickActivity extends Activity
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET) { if (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET) {
int appWidgetId = (data == null) ? -1 : data.getIntExtra( int appWidgetId;
AppWidgetManager.EXTRA_APPWIDGET_ID, -1); if (data == null) {
if ((requestCode == REQUEST_PICK_APPWIDGET) && appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID ;
resultCode == Activity.RESULT_OK) { } else {
appWidgetId = data.getIntExtra(
AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
}
if (requestCode == REQUEST_PICK_APPWIDGET && resultCode == Activity.RESULT_OK) {
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(this); AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(this);
boolean defaultWidget =
data.getBooleanExtra(LockPatternUtils.EXTRA_DEFAULT_WIDGET, false);
AppWidgetProviderInfo appWidget = null; AppWidgetProviderInfo appWidget = null;
if (!defaultWidget) { appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
}
if (!defaultWidget && appWidget.configure != null) { if (appWidget.configure != null) {
// Launch over to configure widget, if needed // Launch over to configure widget, if needed
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE); Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
intent.setComponent(appWidget.configure); intent.setComponent(appWidget.configure);
@@ -591,19 +586,16 @@ public class KeyguardAppWidgetPickActivity extends Activity
startActivityForResultSafely(intent, REQUEST_CREATE_APPWIDGET); startActivityForResultSafely(intent, REQUEST_CREATE_APPWIDGET);
} else { } else {
// Otherwise just add it // Otherwise just add it
if (defaultWidget) {
// If we selected "none", delete the allocated id
AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
LockPatternUtils.ID_DEFAULT_STATUS_WIDGET);
}
onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data); onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
} }
} else if (requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) { } else if (requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {
mSuccess = true;
mLockPatternUtils.addAppWidget(appWidgetId, 0); mLockPatternUtils.addAppWidget(appWidgetId, 0);
finishDelayedAndShowLockScreen(appWidgetId); finishDelayedAndShowLockScreen(appWidgetId);
} else { } else {
if (mAddingToKeyguard &&
mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId);
}
finishDelayedAndShowLockScreen(AppWidgetManager.INVALID_APPWIDGET_ID); finishDelayedAndShowLockScreen(AppWidgetManager.INVALID_APPWIDGET_ID);
} }
} }