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

Merge "Removing auto-padding of widgets, as it is now done at framework level"

Browse Source
This commit is contained in:
Adam Cohen
2011-09-30 19:26:20 -07:00
committed by Android (Google) Code Review
parent f138855ccf 82ebbd2a2f
commit 45d0370b6c
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AppWidgetResizeFrame.java
+5 -5
View File
@@ -111,11 +111,11 @@ public class AppWidgetResizeFrame extends FrameLayout {
Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
addView(mBottomHandle, lp);
Resources r = context.getResources();
mWidgetPaddingLeft = r.getDimensionPixelSize(R.dimen.app_widget_padding_left);
mWidgetPaddingTop = r.getDimensionPixelSize(R.dimen.app_widget_padding_top);
mWidgetPaddingRight = r.getDimensionPixelSize(R.dimen.app_widget_padding_right);
mWidgetPaddingBottom = r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom);
Launcher.Padding p = mLauncher.getPaddingForWidget(widgetView.getAppWidgetInfo().provider);
mWidgetPaddingLeft = p.left;
mWidgetPaddingTop = p.top;
mWidgetPaddingRight = p.right;
mWidgetPaddingBottom = p.bottom;
if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
mTopHandle.setVisibility(GONE);
src/com/android/launcher2/Launcher.java
+11 -5
View File
@@ -75,9 +75,9 @@ import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.Surface;
import android.view.View;
import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.view.View.OnLongClickListener;
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.AccelerateInterpolator;
@@ -876,10 +876,16 @@ public final class Launcher extends Activity
if (appInfo.targetSdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
Resources r = getResources();
p.left = r.getDimensionPixelSize(R.dimen.app_widget_padding_left);
p.right = r.getDimensionPixelSize(R.dimen.app_widget_padding_right);
p.top = r.getDimensionPixelSize(R.dimen.app_widget_padding_top);
p.bottom = r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom);
// The default padding values are private API currently, but will be added in
// API level 15. The current values are (8, 8, 8, 8).
p.left = r.getDimensionPixelSize(com.android.internal.
R.dimen.default_app_widget_padding_left);
p.right = r.getDimensionPixelSize(com.android.internal.
R.dimen.default_app_widget_padding_right);
p.top = r.getDimensionPixelSize(com.android.internal.
R.dimen.default_app_widget_padding_top);
p.bottom = r.getDimensionPixelSize(com.android.internal.
R.dimen.default_app_widget_padding_bottom);
}
return p;
src/com/android/launcher2/LauncherAppWidgetHostView.java
-12
View File
@@ -115,18 +115,6 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView {
}
}
@Override
public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
super.setAppWidget(appWidgetId, info);
// Sometimes the AppWidgetManager returns a null AppWidgetProviderInfo object for
// a widget, eg. for some widgets in safe mode.
if (info != null) {
// We add necessary padding to the AppWidgetHostView
Launcher.Padding padding = mLauncher.getPaddingForWidget(info.provider);
setPadding(padding.left, padding.top, padding.right, padding.bottom);
}
}
@Override
public int getDescendantFocusability() {
return ViewGroup.FOCUS_BLOCK_DESCENDANTS;