resolve merge conflicts of 2fd0208 to ub-launcher3-master
Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90
This commit is contained in:
commit
6982de2485
18 files changed
+28
-24
No files matched your search
@@ -338,7 +338,7 @@ public class Workspace extends PagedView
|
||||
public Workspace(Context context, AttributeSet attrs, int defStyle) {
|
||||
super(context, attrs, defStyle);
|
||||
|
||||
mLauncher = (Launcher) context;
|
||||
mLauncher = Launcher.getLauncher(context);
|
||||
mStateTransitionAnimation = new WorkspaceStateTransitionAnimation(mLauncher, this);
|
||||
final Resources res = getResources();
|
||||
DeviceProfile grid = mLauncher.getDeviceProfile();
|
||||
|
||||
Reference in new issue
Block a user