From 8f572e3b192b198f097df65ea093a92604bb65a0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 26 Apr 2020 08:56:13 +0000
Subject: [PATCH] UI: Use SNAP_FIXED_RATIO for multi-window globally

Enables multiple snap targets under landscape for phone UI

Change-Id: I36e08f1e277dca0b0f9f99418671026e61b01496
---
 core/res/res/values-land/config.xml    | 19 -------------------
 core/res/res/values-sw600dp/config.xml |  2 --
 core/res/res/values/config.xml         |  2 +-
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 core/res/res/values-land/config.xml

diff --git a/core/res/res/values-land/config.xml b/core/res/res/values-land/config.xml
deleted file mode 100644
index 7308dc5882c..00000000000
--- a/core/res/res/values-land/config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources>
-    <integer name="config_dockedStackDividerSnapMode">2</integer>
-</resources>
\ No newline at end of file
diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml
index e2c8d8a57e8..d1a0920862b 100644
--- a/core/res/res/values-sw600dp/config.xml
+++ b/core/res/res/values-sw600dp/config.xml
@@ -40,8 +40,6 @@
     <!-- Use a larger scaling span for larger screen devices. -->
     <dimen name="config_minScalingSpan">32mm</dimen>
 
-    <integer name="config_dockedStackDividerSnapMode">1</integer>
-
     <!-- The snap mode to use for picture-in-picture. These values correspond to constants defined
          in PipSnapAlgorithm and should not be changed independently.
              0 - Snap to the four corners
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index d4b9b5d7fbc..0a8de3d1130 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3385,7 +3385,7 @@
              1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
              2 - 1 snap target: 1:1
     -->
-    <integer name="config_dockedStackDividerSnapMode">0</integer>
+    <integer name="config_dockedStackDividerSnapMode">1</integer>
 
     <!-- The maximum aspect ratio (longerSide/shorterSide) that is treated as close-to-square. The
          orientation requests from apps would be ignored if the display is close-to-square. -->
-- 
2.17.1