Loading res/xml/split_configuration.xmldeleted 100644 → 0 +0 −18 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <resources xmlns:window="http://schemas.android.com/apk/res-auto"> <!-- Automatically split the following activity pairs. --> <SplitPairRule window:splitRatio="@dimen/activity_split_ratio" window:splitLayoutDirection="locale" window:splitMinWidthDp="@integer/min_width_split" window:splitMaxAspectRatioInPortrait="alwaysAllow" window:finishPrimaryWithSecondary="never" window:finishSecondaryWithPrimary="always" window:clearTop="false"> <SplitPairFilter window:primaryActivityName="com.android.launcher3.settings.SettingsActivity" window:secondaryActivityName="com.android.launcher3.settings.SettingsActivity"/> </SplitPairRule> </resources> No newline at end of file src/com/android/launcher3/Launcher.java +5 −5 Original line number Diff line number Diff line Loading @@ -584,10 +584,10 @@ public class Launcher extends StatefulActivity<LauncherState> setTitle(R.string.home_screen); mStartupLatencyLogger.logEnd(LAUNCHER_LATENCY_STARTUP_ACTIVITY_ON_CREATE); if (com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) { RuleController.getInstance(this).setRules( RuleController.parseRules(this, R.xml.split_configuration)); } //if (com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) { // RuleController.getInstance(this).setRules( // RuleController.parseRules(this, R.xml.split_configuration)); //} } protected ModelCallbacks createModelCallbacks() { Loading Loading
res/xml/split_configuration.xmldeleted 100644 → 0 +0 −18 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <resources xmlns:window="http://schemas.android.com/apk/res-auto"> <!-- Automatically split the following activity pairs. --> <SplitPairRule window:splitRatio="@dimen/activity_split_ratio" window:splitLayoutDirection="locale" window:splitMinWidthDp="@integer/min_width_split" window:splitMaxAspectRatioInPortrait="alwaysAllow" window:finishPrimaryWithSecondary="never" window:finishSecondaryWithPrimary="always" window:clearTop="false"> <SplitPairFilter window:primaryActivityName="com.android.launcher3.settings.SettingsActivity" window:secondaryActivityName="com.android.launcher3.settings.SettingsActivity"/> </SplitPairRule> </resources> No newline at end of file
src/com/android/launcher3/Launcher.java +5 −5 Original line number Diff line number Diff line Loading @@ -584,10 +584,10 @@ public class Launcher extends StatefulActivity<LauncherState> setTitle(R.string.home_screen); mStartupLatencyLogger.logEnd(LAUNCHER_LATENCY_STARTUP_ACTIVITY_ON_CREATE); if (com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) { RuleController.getInstance(this).setRules( RuleController.parseRules(this, R.xml.split_configuration)); } //if (com.android.launcher3.Flags.enableTwoPaneLauncherSettings()) { // RuleController.getInstance(this).setRules( // RuleController.parseRules(this, R.xml.split_configuration)); //} } protected ModelCallbacks createModelCallbacks() { Loading