96 lines
4.1 KiB
Diff
96 lines
4.1 KiB
Diff
From 99e4502aee5fea10fba50da3ccad5fee9409f0ad 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 | 18 ++++++++----------
|
|
core/res/res/values/config.xml | 2 +-
|
|
3 files changed, 9 insertions(+), 30 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 34b6a54be49..3921c9edfea 100644
|
|
--- a/core/res/res/values-sw600dp/config.xml
|
|
+++ b/core/res/res/values-sw600dp/config.xml
|
|
@@ -3,16 +3,16 @@
|
|
/*
|
|
** Copyright 2009, 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
|
|
+** 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
|
|
+** 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
|
|
+** 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.
|
|
*/
|
|
-->
|
|
@@ -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>
|
|
-
|
|
<!-- Controls whether the nav bar can move from the bottom to the side in landscape.
|
|
Only applies if the device display is not square. -->
|
|
<bool name="config_navBarCanMove">false</bool>
|
|
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
|
|
index ff6829c9624..9bedf5cfa07 100644
|
|
--- a/core/res/res/values/config.xml
|
|
+++ b/core/res/res/values/config.xml
|
|
@@ -3303,7 +3303,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.25.1
|
|
|