aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts for e78e3d73 to ub-launcher3-master

Browse Source 
Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6
This commit is contained in:
Sunny Goyal
2015-09-25 11:50:16 -07:00
parent 1f832f85d5 e78e3d734b
commit 9d4380856f
14 changed files with 207 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/widget/WidgetsContainerView.java
View File

@@ -148,8 +148,11 @@ public class WidgetsContainerView extends BaseContainerView
if (mWidgetInstructionToast != null) {
mWidgetInstructionToast.cancel();
}
mWidgetInstructionToast = Toast.makeText(getContext(),R.string.long_press_widget_to_add,
Toast.LENGTH_SHORT);
CharSequence msg = Utilities.wrapForTts(
getContext().getText(R.string.long_press_widget_to_add),
getContext().getString(R.string.long_accessible_way_to_add));
mWidgetInstructionToast = Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT);
mWidgetInstructionToast.show();
}
@@ -164,7 +167,6 @@ public class WidgetsContainerView extends BaseContainerView
if (!mLauncher.isWidgetsViewVisible() ||
mLauncher.getWorkspace().isSwitchingState()) return false;
// Return if global dragging is not enabled
Log.d(TAG, String.format("onLonglick dragging enabled?.", v));
if (!mLauncher.isDraggingEnabled()) return false;
boolean status = beginDragging(v);