ExactCalculator: Simplify layouts
Change-Id: I3f62e92335d9914ecb8c04e646348d8f47757f4a
diff --git a/res/layout-land/activity_calculator.xml b/res/layout-land/activity_calculator.xml
new file mode 100644
index 0000000..0bf3b01
--- /dev/null
+++ b/res/layout-land/activity_calculator.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2023 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <include
+ layout="@layout/display_one_line"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="100">
+
+ <include layout="@layout/pad_advanced_3x4" />
+ <include layout="@layout/pad_numeric" />
+ <include layout="@layout/pad_operator_two_col" />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator.xml
similarity index 84%
rename from res/layout/activity_calculator_port.xml
rename to res/layout/activity_calculator.xml
index 43497eb..62986da 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator.xml
@@ -21,9 +21,9 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <include layout="@layout/display" />
+ <include layout="@layout/display_two_line" />
- <include layout="@layout/pad_advanced" />
+ <include layout="@layout/pad_advanced_4x3" />
<LinearLayout
android:layout_width="match_parent"
@@ -31,7 +31,7 @@
android:orientation="vertical"
android:layout_weight="225">
- <include layout="@layout/pad_operator_aux" />
+ <include layout="@layout/pad_operator_one_col_aux" />
<LinearLayout
android:layout_width="fill_parent"
@@ -39,7 +39,7 @@
android:layout_weight="750">
<include layout="@layout/pad_numeric"/>
- <include layout="@layout/pad_operator" />
+ <include layout="@layout/pad_operator_one_col" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml
deleted file mode 100644
index 522ed3b..0000000
--- a/res/layout/activity_calculator_land.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 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.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <include
- layout="@layout/display"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="100">
-
- <include layout="@layout/pad_advanced" />
- <include layout="@layout/pad_numeric" />
- <include layout="@layout/pad_operator" />
-
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values-land/layout.xml b/res/values-land/layout.xml
deleted file mode 100644
index ffe53a8..0000000
--- a/res/values-land/layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 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>
- <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item>
- <item name="display" type="layout">@layout/display_one_line</item>
- <item name="pad_advanced" type="layout">@layout/pad_advanced_3x4</item>
- <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
diff --git a/res/values-sw600dp-land/layout.xml b/res/values-sw600dp-land/layout.xml
deleted file mode 100644
index 6aed628..0000000
--- a/res/values-sw600dp-land/layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 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>
- <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item>
- <item name="display" type="layout">@layout/display_two_line</item>
- <item name="pad_advanced" type="layout">@layout/pad_advanced_3x4</item>
- <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>
-</resources>
diff --git a/res/values-sw600dp/layout.xml b/res/values-sw600dp/layout.xml
deleted file mode 100644
index 6e2d219..0000000
--- a/res/values-sw600dp/layout.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 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>
- <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
- <item name="display" type="layout">@layout/display_two_line</item>
- <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>
- <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
- <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>
-</resources>
diff --git a/res/values/layout.xml b/res/values/layout.xml
deleted file mode 100644
index 6e2d219..0000000
--- a/res/values/layout.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 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>
- <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>
- <item name="display" type="layout">@layout/display_two_line</item>
- <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>
- <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>
- <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>
-</resources>