Merge "Separating the config and flags in different directories so that it is easier to override one or the other" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot
2017-03-07 22:42:13 +00:00
committed by Android (Google) Code Review
28 changed files with 70 additions and 82 deletions
@@ -23,7 +23,7 @@ import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherModel.BaseModelUpdateTask;
import com.android.launcher3.LauncherModel.Callbacks;
import com.android.launcher3.config.ProviderConfig;
import com.android.launcher3.LauncherProvider;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.Provider;
import com.android.launcher3.util.TestLauncherProvider;
@@ -64,7 +64,7 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP
public Callbacks callbacks;
public BaseModelUpdateTaskTestCase() {
super(TestLauncherProvider.class, ProviderConfig.AUTHORITY);
super(TestLauncherProvider.class, LauncherProvider.AUTHORITY);
}
@Override