Sriram Ramasubramanian
|
8d7238370b
|
Bug 848719: TabsButton will have curve only one side. [r=mfinkle] [needs-clobber]
--HG--
extra : rebase_source : 815c210eb08dbe17801fd951822a0b3908ed96a6
|
2013-03-14 15:26:25 -07:00 |
|
Lucas Rocha
|
452f350ce1
|
Bug 838652 - Use res-auto namespace alias instead of preprocessing files (r=mfinkle)
--HG--
rename : mobile/android/base/resources/color/abouthome_section_more_text.xml.in => mobile/android/base/resources/color/abouthome_section_more_text.xml
rename : mobile/android/base/resources/color/abouthome_section_subtitle.xml.in => mobile/android/base/resources/color/abouthome_section_subtitle.xml
rename : mobile/android/base/resources/color/abouthome_section_title.xml.in => mobile/android/base/resources/color/abouthome_section_title.xml
rename : mobile/android/base/resources/color/awesome_bar_title.xml.in => mobile/android/base/resources/color/awesome_bar_title.xml
rename : mobile/android/base/resources/color/awesome_bar_title_hint.xml.in => mobile/android/base/resources/color/awesome_bar_title_hint.xml
rename : mobile/android/base/resources/drawable/abouthome_logo.xml.in => mobile/android/base/resources/drawable/abouthome_logo.xml
rename : mobile/android/base/resources/drawable/address_bar_bg.xml.in => mobile/android/base/resources/drawable/address_bar_bg.xml
rename : mobile/android/base/resources/drawable/address_bar_nav_button.xml.in => mobile/android/base/resources/drawable/address_bar_nav_button.xml
rename : mobile/android/base/resources/drawable/address_bar_url.xml.in => mobile/android/base/resources/drawable/address_bar_url.xml
rename : mobile/android/base/resources/drawable/menu_item_state.xml.in => mobile/android/base/resources/drawable/menu_item_state.xml
rename : mobile/android/base/resources/drawable/menu_level.xml.in => mobile/android/base/resources/drawable/menu_level.xml
rename : mobile/android/base/resources/layout-land-v14/browser_toolbar.xml.in => mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
rename : mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml.in => mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml
rename : mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml.in => mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
rename : mobile/android/base/resources/layout-large-v11/awesomebar_search.xml.in => mobile/android/base/resources/layout-large-v11/awesomebar_search.xml
rename : mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in => mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
rename : mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in => mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
rename : mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml.in => mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
rename : mobile/android/base/resources/layout/abouthome_content.xml.in => mobile/android/base/resources/layout/abouthome_content.xml
rename : mobile/android/base/resources/layout/awesomebar_search.xml.in => mobile/android/base/resources/layout/awesomebar_search.xml
rename : mobile/android/base/resources/layout/awesomebar_suggestion_row.xml.in => mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
rename : mobile/android/base/resources/layout/awesomebar_tab_indicator.xml.in => mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
rename : mobile/android/base/resources/layout/browser_toolbar.xml.in => mobile/android/base/resources/layout/browser_toolbar.xml
rename : mobile/android/base/resources/layout/browser_toolbar_menu.xml.in => mobile/android/base/resources/layout/browser_toolbar_menu.xml
rename : mobile/android/base/resources/layout/gecko_app.xml.in => mobile/android/base/resources/layout/gecko_app.xml
rename : mobile/android/base/resources/layout/tabs_panel.xml.in => mobile/android/base/resources/layout/tabs_panel.xml
rename : mobile/android/base/resources/layout/text_selection_handles.xml.in => mobile/android/base/resources/layout/text_selection_handles.xml
rename : mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in => mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
rename : mobile/android/base/resources/menu-v11/browser_app_menu.xml.in => mobile/android/base/resources/menu-v11/browser_app_menu.xml
rename : mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in => mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
rename : mobile/android/base/resources/menu/browser_app_menu.xml.in => mobile/android/base/resources/menu/browser_app_menu.xml
|
2013-03-15 00:44:00 +00:00 |
|
Sriram Ramasubramanian
|
47d638630d
|
Bug 848707: Change highlight color. [r=mfinkle]
|
2013-03-13 12:16:09 -07:00 |
|
Sriram Ramasubramanian
|
2b5ecb19c7
|
Bug 821848: Cursor is not seen in private mode. [r=bnicholson]
|
2013-02-28 15:27:56 -08:00 |
|
Lucas Rocha
|
6e93f5db82
|
Bug 817721/817735/817732 - New tabs tray layout with horizontal scrolling (r=mfinkle) (needs-clobber)
--HG--
rename : mobile/android/base/resources/drawable-xlarge-hdpi-v11/menu.png => mobile/android/base/resources/drawable-large-hdpi-v11/menu.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi-v11/tabs_carat_contracted.png => mobile/android/base/resources/drawable-large-hdpi-v11/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi-v11/tabs_carat_expanded.png => mobile/android/base/resources/drawable-large-hdpi-v11/tabs_carat_expanded.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi-v11/tabs_menu.png => mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml => mobile/android/base/resources/drawable-large-land-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml => mobile/android/base/resources/drawable-large-land-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/menu.png => mobile/android/base/resources/drawable-large-mdpi-v11/menu.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_carat_contracted.png => mobile/android/base/resources/drawable-large-mdpi-v11/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_carat_expanded.png => mobile/android/base/resources/drawable-large-mdpi-v11/tabs_carat_expanded.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_menu.png => mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi-v11/menu.png => mobile/android/base/resources/drawable-large-xhdpi-v11/menu.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi-v11/tabs_carat_contracted.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi-v11/tabs_carat_expanded.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_carat_expanded.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi-v11/tabs_menu.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png
rename : mobile/android/base/resources/layout-xlarge-v11/tabs_panel.xml.in => mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml.in
rename : mobile/android/base/resources/layout-xlarge-v11/tabs_panel_footer.xml => mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
rename : mobile/android/base/resources/layout-xlarge-v11/tabs_panel_header.xml => mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
|
2013-02-22 07:23:16 +00:00 |
|
Lucas Rocha
|
a09a4ed0f0
|
Bug 817721/817735/817732 - Change sidebar state to be dynamic (r=mfinkle)
|
2013-02-22 07:22:37 +00:00 |
|
Lucas Rocha
|
61beed7d46
|
Bug 817721/817735/817732 - New TabsPanel sizing (r=mfinkle)
|
2013-02-22 07:22:37 +00:00 |
|
Sriram Ramasubramanian
|
6f2bed14fb
|
Bug 840871: TabsPanel is not needed to be shown right on startup. [r=mfinkle]
|
2013-02-19 12:39:05 -08:00 |
|
Sriram Ramasubramanian
|
ff3fa5c956
|
Bug 841567: Make the opacity behind the thumbnail title better. [r=mfinkle]
--HG--
extra : rebase_source : 42317c3481401aa86582dbc39085a22069287ef8
|
2013-02-15 12:51:30 -08:00 |
|
Sriram Ramasubramanian
|
bc3974fc63
|
Bug 837113: Close button in tabs ui. [r=mfinkle]
--HG--
extra : rebase_source : 52af4d8e0316be67838fcd5a463a5fdcbac124c2
|
2013-02-14 13:23:15 -08:00 |
|
Sriram Ramasubramanian
|
809df9c68e
|
Bug 840346: Flat URL bar. [r=mfinkle]
--HG--
extra : rebase_source : 25e8b78e6ef97e3bb1e0ccb701bd98d9d1b24e4c
|
2013-02-13 08:50:56 -08:00 |
|
Sriram Ramasubramanian
|
7e6443e07b
|
Bug 838748: Change pressed state of tabs-ui rows. [r=mfinkle]
|
2013-02-07 12:48:28 -08:00 |
|
Sriram Ramasubramanian
|
2961ecf054
|
Bug 838807: Flatten all icons. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png
|
2013-02-06 13:21:23 -08:00 |
|
Sriram Ramasubramanian
|
d82b822070
|
Bug 836043: Replace tabs toolbar background with a dark one. [r=mfinkle]
--HG--
extra : rebase_source : cfe5ff7847783a0a58142de1b30abfe53c95d8e8
|
2013-01-29 15:57:52 -08:00 |
|
Sriram Ramasubramanian
|
f877b25250
|
Bug 836043: Use icon-tabs for tab switcher in tabs-ui. [r=mfinkle]
--HG--
extra : rebase_source : efa4b1633f7bbf4bcacc4b2140c759f1666386f6
|
2013-01-29 14:43:34 -08:00 |
|
Sriram Ramasubramanian
|
d884771da1
|
Bug 834525: New tab thumbnail styling for tabs-ui. [r=mfinkle]
--HG--
extra : rebase_source : a774fdea385a9f3e9997adebf730cdb40e9e8a92
|
2013-01-24 17:08:08 -08:00 |
|
Phil Ringnalda
|
a672c7a775
|
Back out baa055cb9043 (bug 834525) for robocop bustage
--HG--
extra : rebase_source : 8972732b87274e1c657aa86fa798224895d512fe
|
2013-01-25 14:32:21 -08:00 |
|
Sriram Ramasubramanian
|
dfc7d5d674
|
Bug 834525: Tab thumbnail styling on phones and tablets. [r=mfinkle] [needs-clobber]
--HG--
extra : rebase_source : 3a06d02240be1381498f5d73a5d48258ad145a20
|
2013-01-24 17:08:08 -08:00 |
|
Wes Johnston
|
ab25aae43c
|
Bug 792410 - Scale tab thumbnails from the upper left corner. r=sriram
* * *
Bug 792410 - Add lost curly brace. r=sriram,bustage
|
2013-01-18 11:45:10 -08:00 |
|
Sriram Ramasubramanian
|
ea6ba8982d
|
Bug 832433: Remove Android Tabs widget in tabs ui. [r=mfinkle] [needs-clobber]
--HG--
extra : rebase_source : a64bfad708d610e7c9ad78ed2d21132da45d80f4
|
2013-01-18 11:58:45 -08:00 |
|
Sriram Ramasubramanian
|
38defcdb4f
|
Bug 832433: Use Android spinners on tabs UI for phones. [r=mfinkle]
--HG--
extra : rebase_source : 614269ba99d278771a293c45252ace306bdaa8d9
|
2013-01-18 11:41:44 -08:00 |
|
Wes Johnston
|
d38e9b02c2
|
backout 9f81c93ea0ea and 40badd9d545a
|
2013-01-18 13:16:24 -08:00 |
|
Wes Johnston
|
45434b3a67
|
Bug 792410 - Scale tab thumbnails from the upper left corner. r=sriram
|
2013-01-18 11:45:10 -08:00 |
|
Sriram Ramasubramanian
|
a15006d7fb
|
Bug 831402: Dividers in tabs UI should be with action-bar. [r=mfinkle]
--HG--
extra : rebase_source : 3e9283838ef85ee713a2e7a7495d493d176f7647
|
2013-01-16 14:04:53 -08:00 |
|
Sriram Ramasubramanian
|
4230f69ba7
|
Bug 831402: Tablets will have a split action-bar. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/layout-xlarge-v11/tabs_panel_toolbar_menu.xml => mobile/android/base/resources/layout-xlarge-v11/tabs_panel_header.xml
rename : mobile/android/base/resources/layout/tabs_panel_toolbar_menu.xml => mobile/android/base/resources/layout/tabs_panel_header.xml
extra : rebase_source : c8611c910c442439ce46807362a29a3086b6460a
|
2013-01-16 11:26:48 -08:00 |
|
Sriram Ramasubramanian
|
4a0d986b15
|
Bug 831402: Use android spinners for tablets. [r=mfinkle]
--HG--
extra : rebase_source : dff6de264cd969f4c075c0636257c3434ecfcdd5
|
2013-01-16 11:11:03 -08:00 |
|
Sriram Ramasubramanian
|
db04f9a326
|
Bug 817739: Theme change for synced tabs. [r=mfinkle]
--HG--
extra : rebase_source : 9b10d242c2c560489974cf7f23c5418a8370fc8a
|
2013-01-10 13:06:32 -08:00 |
|
Sriram Ramasubramanian
|
c524b1f38a
|
Bug 826819: New private tab icon for the tabs-panel and the menu. [r=mfinkle]
--HG--
extra : rebase_source : 8cf383a0817f5d3a67871ae44b64741dcd0a1294
|
2013-01-10 12:22:43 -08:00 |
|
Sriram Ramasubramanian
|
37476abaed
|
Bug 817749: No squishy button in tabs toolbar. [r=mfinkle]
|
2012-12-19 12:27:42 -08:00 |
|
Sriram Ramasubramanian
|
d9059a59a2
|
Bug 817706: Tablets should have a drop-down tabs-switcher. [r=mfinkle]
|
2012-12-18 16:45:55 -08:00 |
|
Sriram Ramasubramanian
|
c2a7bc048d
|
Bug 817706: Tab-style switcher in tabs-tray for phones. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/layout/tabs_panel.xml => mobile/android/base/resources/layout/tabs_panel.xml.in
|
2012-12-18 17:04:39 -08:00 |
|
Wes Johnston
|
862c6965a0
|
Bug 681805 - Move forward button styling to style files. r=lucasr
|
2012-12-19 09:28:59 -08:00 |
|
Nick Thomas
|
34733c2752
|
Back out 47debf3f344c for Android test fail CLOSED TREE
|
2012-12-20 22:12:19 +13:00 |
|
Wes Johnston
|
b1286c4746
|
Bug 681805 - Move forward button styling to style files. r=lucasr
|
2012-12-19 09:28:59 -08:00 |
|
Ed Morley
|
21bf9e2a0e
|
Backout 0e96545f0894 & 55ae87306b98 (bug 681805) for Android startup crashes on a CLOSED TREE
|
2012-12-19 18:25:55 +00:00 |
|
Wes Johnston
|
6d756ae92c
|
Bug 681805 - Move forward button styling to style files. r=lucasr
|
2012-12-19 09:28:59 -08:00 |
|
Sriram Ramasubramanian
|
991ee22253
|
Bug 818071: Replace private browsing resources for the url-bar. [r=mfinkle]
|
2012-12-07 14:10:05 -08:00 |
|
Sriram Ramasubramanian
|
0c4f4d4e7f
|
Bug 818071: Change the menu icons to 3-dots. [r=mfinkle]
--HG--
extra : rebase_source : 4cefa57061fdb31aa8159757197779dee46f9567
|
2012-12-04 14:22:56 -08:00 |
|
Sriram Ramasubramanian
|
43d0709454
|
Bug 818238: A GeckoPopupMenu for tabs-tray. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable-hdpi/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_synced_tabs.png => mobile/android/base/resources/drawable-hdpi/ic_menu_synced_tabs.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_synced_tabs.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_synced_tabs.png
rename : mobile/android/base/resources/drawable-mdpi-v11/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable-mdpi-v11/ic_menu_synced_tabs.png => mobile/android/base/resources/drawable/ic_menu_synced_tabs.png
extra : rebase_source : 1021520012fa821a283f4dfab780a73503f4d49e
|
2012-12-04 13:13:24 -08:00 |
|
Sriram Ramasubramanian
|
8bdeb3fdaa
|
Bug 817138: Re-create back/forward button in code. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/address_bar_back_button.xml => mobile/android/base/resources/drawable/address_bar_nav_button.xml
extra : rebase_source : 8bfb59c06c0ad3fe648a2e0fc3ca6176c5617291
|
2012-11-30 13:16:45 -08:00 |
|
Sriram Ramasubramanian
|
7c573b77bb
|
Bug 806937: Private tabs support for awesomescreen. [r=mfinkle]
|
2012-11-16 00:41:53 -08:00 |
|
Sriram Ramasubramanian
|
a3a667f0ff
|
Bug 806937: Private browsing mode support for Menu button. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/menu_level.xml => mobile/android/base/resources/drawable/menu_level.xml.in
|
2012-11-16 00:21:46 -08:00 |
|
Sriram Ramasubramanian
|
b1bfb09bdc
|
Bug 806937: Private browsing mode for Tabs button. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in
rename : mobile/android/base/resources/drawable/tabs_button.xml => mobile/android/base/resources/drawable/tabs_button.xml.in
rename : mobile/android/base/resources/drawable/tabs_level.xml => mobile/android/base/resources/drawable/tabs_level.xml.in
|
2012-11-15 23:59:25 -08:00 |
|
Sriram Ramasubramanian
|
5a1e9f85a6
|
Bug 806937: Private browsing mode support for AwesomeBar. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/address_bar_url.xml => mobile/android/base/resources/drawable/address_bar_url.xml.in
|
2012-11-15 21:40:57 -08:00 |
|
Mark Finkle
|
63386424e3
|
Backout 11fcd37bfb7d, cdf30a34dec9, d5f4626f5b73, e0a0a5b98b95, 944db176184e, 984a10bc4125, 585a7f8fc448, abfc930bc7cd for test failures
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable/address_bar_url.xml.in => mobile/android/base/resources/drawable/address_bar_url.xml
rename : mobile/android/base/resources/drawable/menu_level.xml.in => mobile/android/base/resources/drawable/menu_level.xml
|
2012-11-28 21:55:05 -05:00 |
|
Sriram Ramasubramanian
|
a70c86db66
|
Bug 806937: Private tabs support for awesomescreen. [r=mfinkle]
|
2012-11-16 00:41:53 -08:00 |
|
Sriram Ramasubramanian
|
fcb4d6c0bc
|
Bug 806937: Private browsing mode support for Menu button. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/menu_level.xml => mobile/android/base/resources/drawable/menu_level.xml.in
|
2012-11-16 00:21:46 -08:00 |
|
Sriram Ramasubramanian
|
db03970222
|
Bug 806937: Private browsing mode for Tabs button. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in
rename : mobile/android/base/resources/drawable/tabs_button.xml => mobile/android/base/resources/drawable/tabs_button.xml.in
rename : mobile/android/base/resources/drawable/tabs_level.xml => mobile/android/base/resources/drawable/tabs_level.xml.in
|
2012-11-15 23:59:25 -08:00 |
|
Sriram Ramasubramanian
|
8750294ac1
|
Bug 806937: Private browsing mode support for AwesomeBar. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/address_bar_url.xml => mobile/android/base/resources/drawable/address_bar_url.xml.in
|
2012-11-15 21:40:57 -08:00 |
|
Wes Johnston
|
f8d70a077b
|
Bug 808663 - Use nearest neighbor scaling for favicons in awesomescreen. r=bnicholson
|
2012-11-06 19:51:06 -08:00 |
|