Bug 1375448 (Part 3) - duplicate dimens.xml draft
authorJulian_Chu <walkingice0204@gmail.com>
Mon, 19 Jun 2017 16:46:03 +0800
changeset 599476 075ef8bd6f27f9b5f053ed83a7253b947e5c9dd5
parent 599475 86388d7bbd015abf57696db0091bbb8d7e213685
child 599477 6738eb614d8df947a926c2971cae2ededad9e302
push id65541
push userbmo:walkingice0204@gmail.com
push dateFri, 23 Jun 2017 07:18:28 +0000
bugs1375448
milestone56.0a1
Bug 1375448 (Part 3) - duplicate dimens.xml There will be lots of color change in Photon. To duplicate dimens.xml so any changes to Photon won't effect Australis flavor. In this commit we did 1. move xml file from 'main' to 'australis' 2. copy xml file from 'australis' to 'photon' 3. indent/reformat xml file in 'photon' by Android Studio. MozReview-Commit-ID: 8LTzfh6NukL
mobile/android/app/src/australis/res/values-land/dimens.xml
mobile/android/app/src/australis/res/values-large-land-v11/dimens.xml
mobile/android/app/src/australis/res/values-large-v16/dimens.xml
mobile/android/app/src/australis/res/values-large/dimens.xml
mobile/android/app/src/australis/res/values-sw240dp/dimens.xml
mobile/android/app/src/australis/res/values-sw360dp/dimens.xml
mobile/android/app/src/australis/res/values-sw400dp/dimens.xml
mobile/android/app/src/australis/res/values-v11/dimens.xml
mobile/android/app/src/australis/res/values-v19/dimens.xml
mobile/android/app/src/australis/res/values-v21/dimens.xml
mobile/android/app/src/australis/res/values-xlarge-land-v11/dimens.xml
mobile/android/app/src/australis/res/values-xlarge-v11/dimens.xml
mobile/android/app/src/australis/res/values/dimens.xml
mobile/android/app/src/main/res/values-land/dimens.xml
mobile/android/app/src/main/res/values-large-land-v11/dimens.xml
mobile/android/app/src/main/res/values-large-v16/dimens.xml
mobile/android/app/src/main/res/values-large/dimens.xml
mobile/android/app/src/main/res/values-sw240dp/dimens.xml
mobile/android/app/src/main/res/values-sw360dp/dimens.xml
mobile/android/app/src/main/res/values-sw400dp/dimens.xml
mobile/android/app/src/main/res/values-v11/dimens.xml
mobile/android/app/src/main/res/values-v19/dimens.xml
mobile/android/app/src/main/res/values-v21/dimens.xml
mobile/android/app/src/main/res/values-xlarge-land-v11/dimens.xml
mobile/android/app/src/main/res/values-xlarge-v11/dimens.xml
mobile/android/app/src/main/res/values/dimens.xml
mobile/android/app/src/photon/res/values-land/dimens.xml
mobile/android/app/src/photon/res/values-large-land-v11/dimens.xml
mobile/android/app/src/photon/res/values-large-v16/dimens.xml
mobile/android/app/src/photon/res/values-large/dimens.xml
mobile/android/app/src/photon/res/values-sw240dp/dimens.xml
mobile/android/app/src/photon/res/values-sw360dp/dimens.xml
mobile/android/app/src/photon/res/values-sw400dp/dimens.xml
mobile/android/app/src/photon/res/values-v11/dimens.xml
mobile/android/app/src/photon/res/values-v19/dimens.xml
mobile/android/app/src/photon/res/values-v21/dimens.xml
mobile/android/app/src/photon/res/values-xlarge-land-v11/dimens.xml
mobile/android/app/src/photon/res/values-xlarge-v11/dimens.xml
mobile/android/app/src/photon/res/values/dimens.xml
rename from mobile/android/app/src/main/res/values-land/dimens.xml
rename to mobile/android/app/src/australis/res/values-land/dimens.xml
rename from mobile/android/app/src/main/res/values-large-land-v11/dimens.xml
rename to mobile/android/app/src/australis/res/values-large-land-v11/dimens.xml
rename from mobile/android/app/src/main/res/values-large-v16/dimens.xml
rename to mobile/android/app/src/australis/res/values-large-v16/dimens.xml
rename from mobile/android/app/src/main/res/values-large/dimens.xml
rename to mobile/android/app/src/australis/res/values-large/dimens.xml
rename from mobile/android/app/src/main/res/values-sw240dp/dimens.xml
rename to mobile/android/app/src/australis/res/values-sw240dp/dimens.xml
rename from mobile/android/app/src/main/res/values-sw360dp/dimens.xml
rename to mobile/android/app/src/australis/res/values-sw360dp/dimens.xml
rename from mobile/android/app/src/main/res/values-sw400dp/dimens.xml
rename to mobile/android/app/src/australis/res/values-sw400dp/dimens.xml
rename from mobile/android/app/src/main/res/values-v11/dimens.xml
rename to mobile/android/app/src/australis/res/values-v11/dimens.xml
rename from mobile/android/app/src/main/res/values-v19/dimens.xml
rename to mobile/android/app/src/australis/res/values-v19/dimens.xml
rename from mobile/android/app/src/main/res/values-v21/dimens.xml
rename to mobile/android/app/src/australis/res/values-v21/dimens.xml
rename from mobile/android/app/src/main/res/values-xlarge-land-v11/dimens.xml
rename to mobile/android/app/src/australis/res/values-xlarge-land-v11/dimens.xml
rename from mobile/android/app/src/main/res/values-xlarge-v11/dimens.xml
rename to mobile/android/app/src/australis/res/values-xlarge-v11/dimens.xml
rename from mobile/android/app/src/main/res/values/dimens.xml
rename to mobile/android/app/src/australis/res/values/dimens.xml
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-land/dimens.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
+    <dimen name="home_remote_tabs_top_padding">16dp</dimen>
+    <dimen name="tab_panel_grid_hpadding">48dp</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-large-land-v11/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
+    <dimen name="home_remote_tabs_top_padding">48dp</dimen>
+    <dimen name="home_header_item_height">64dp</dimen>
+
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-large-v16/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <dimen name="doorhanger_offsetY">124dp</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-large/dimens.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <dimen name="doorhanger_offsetY">100dp</dimen>
+
+    <dimen name="browser_toolbar_height">56dp</dimen>
+    <!-- This value is the height of the Tabs Panel header view
+         (browser_toolbar_height) minus the height of the indicator
+         (6dp). This value should change when the height of the view changes. -->
+    <dimen name="tabs_panel_indicator_selected_padding_top">50dp</dimen>
+
+    <dimen name="browser_toolbar_height_flipper">60dp</dimen>
+    <dimen name="browser_toolbar_button_padding">16dp</dimen>
+    <dimen name="browser_toolbar_favicon_size">16dp</dimen>
+
+    <dimen name="browser_toolbar_site_security_height">60dp</dimen>
+    <dimen name="browser_toolbar_site_security_width">34dp</dimen>
+    <dimen name="browser_toolbar_site_security_margin_end">1dp</dimen>
+    <!-- We primarily use padding (instead of margins) to increase the hit area. -->
+    <dimen name="browser_toolbar_site_security_padding_vertical">21dp</dimen>
+    <dimen name="browser_toolbar_site_security_padding_horizontal">8dp</dimen>
+
+    <dimen name="firstrun_background_height">300dp</dimen>
+
+    <dimen name="tabs_panel_indicator_width">72dp</dimen>
+    <dimen name="tabs_panel_button_width">60dp</dimen>
+    <dimen name="panel_grid_view_column_width">200dp</dimen>
+
+    <dimen name="overlay_prompt_container_width">360dp</dimen>
+
+    <item name="tab_strip_content_start" type="dimen">72dp</item>
+
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-sw240dp/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <dimen name="tab_panel_item_width">143dip</dimen>
+    <dimen name="tab_thumbnail_height">100dip</dimen>
+    <dimen name="tab_thumbnail_width">135dip</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-sw360dp/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <dimen name="tab_panel_item_width">156dip</dimen>
+    <dimen name="tab_thumbnail_height">110dip</dimen>
+    <dimen name="tab_thumbnail_width">148dip</dimen>
+
+    <dimen name="firstrun_background_height">180dp</dimen>
+    <dimen name="firstrun_min_height">180dp</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-sw400dp/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <dimen name="tab_panel_item_width">176dip</dimen>
+    <dimen name="tab_thumbnail_height">120dip</dimen>
+    <dimen name="tab_thumbnail_width">168dip</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-v11/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <!-- This is chosen to be close to Android's listPreferredItemHeightSmall.
+         TODO: We should inherit these from the system.
+         http://androidxref.com/4.2.2_r1/xref/frameworks/base/core/res/res/values/themes.xml#1287 -->
+    <dimen name="menu_item_row_height">48dp</dimen>
+
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-v19/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <dimen name="toast_button_corner_radius">24dp</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-v21/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <dimen name="context_menu_item_horizontal_padding">17dp</dimen>
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-xlarge-land-v11/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <dimen name="tab_panel_grid_hpadding">64dp</dimen>
+
+</resources>
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values-xlarge-v11/dimens.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <dimen name="panel_grid_view_column_width">250dp</dimen>
+    <dimen name="tab_panel_grid_hpadding">48dp</dimen>
+
+</resources>
copy from mobile/android/app/src/main/res/values/dimens.xml
copy to mobile/android/app/src/photon/res/values/dimens.xml