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

resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev

Browse Source 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
This commit is contained in:
vadimt
2019-10-03 13:34:28 -07:00
committed by Vadim Tryshev
parent 055c22e8e6 08776ada1e
commit 1ac98548a7
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java
+5 -6
View File
@@ -37,12 +37,6 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
return response;
}
case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: {
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
TouchInteractionService.isInitialized());
return response;
}
case TestProtocol.REQUEST_HOTSEAT_TOP: {
if (mLauncher == null) return null;
@@ -81,4 +75,9 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
return super.call(method);
}
@Override
protected boolean isLauncherInitialized() {
return super.isLauncherInitialized() && TouchInteractionService.isInitialized();
}
}
src/com/android/launcher3/testing/TestInformationHandler.java
+8 -1
View File
@@ -29,6 +29,7 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
import com.android.launcher3.allapps.AllAppsStore;
@@ -83,7 +84,7 @@ public class TestInformationHandler implements ResourceBasedOverride {
}
case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: {
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, true);
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, isLauncherInitialized());
break;
}
@@ -153,4 +154,10 @@ public class TestInformationHandler implements ResourceBasedOverride {
}
return response;
}
protected boolean isLauncherInitialized() {
final LauncherModel model = LauncherAppState.getInstance(mContext).getModel();
return model.getCallback() == null || model.isModelLoaded();
}
}
tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java
-3
View File
@@ -73,7 +73,6 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
waitForModelLoaded();
mLauncher.getWorkspace().getHotseatAppIcon(getSettingsApp().getLabel().toString());
}
@@ -89,7 +88,6 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
waitForModelLoaded();
// Verify widget present
assertTrue("Widget is not present",
@@ -106,7 +104,6 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
waitForModelLoaded();
mLauncher.getWorkspace().getHotseatFolder("Folder: Copy");
}
tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
-1
View File
@@ -271,7 +271,6 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
waitForModelLoaded();
}
private void verifyWidgetPresent(LauncherAppWidgetProviderInfo info) {