Updates to SWE browser's options menu
- Changed the contents of the menu
- Iconified frequently used items
- Changes to layout and menu animation
- Removed popup menu from History and Bookmarks page
-- Added buttons to these pages to replace menu items
- Updated icons used in popup menu
- Added menu option to save link to homepage
- Add bookmark icon color depicts if bookmark exists
Change-Id: I37226506737647367f71159f1a439cc3fca4ae03
diff --git a/res/drawable-xxhdpi/ic_action_add_incognito_active.png b/res/drawable-xxhdpi/ic_action_add_incognito_active.png
new file mode 100644
index 0000000..fc2316c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_incognito_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png b/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png
new file mode 100644
index 0000000..3931985
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_incognito_normal.png b/res/drawable-xxhdpi/ic_action_add_incognito_normal.png
new file mode 100644
index 0000000..783f11b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_incognito_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_tab_active.png b/res/drawable-xxhdpi/ic_action_add_tab_active.png
new file mode 100644
index 0000000..d7e01fa
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_tab_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_tab_disabled.png b/res/drawable-xxhdpi/ic_action_add_tab_disabled.png
new file mode 100644
index 0000000..a31420b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_tab_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_tab_normal.png b/res/drawable-xxhdpi/ic_action_add_tab_normal.png
new file mode 100644
index 0000000..468a691
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_tab_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_active.png b/res/drawable-xxhdpi/ic_action_bookmark_active.png
new file mode 100644
index 0000000..74711e1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_bookmark_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_checked.png b/res/drawable-xxhdpi/ic_action_bookmark_checked.png
new file mode 100644
index 0000000..808fa5a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_bookmark_checked.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_disabled.png b/res/drawable-xxhdpi/ic_action_bookmark_disabled.png
new file mode 100644
index 0000000..5f7f033
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_bookmark_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_normal.png b/res/drawable-xxhdpi/ic_action_bookmark_normal.png
new file mode 100644
index 0000000..cfbdb6c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_bookmark_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_backward_active.png b/res/drawable-xxhdpi/ic_action_history_backward_active.png
new file mode 100644
index 0000000..4baf3c4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_history_backward_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_backward_disabled.png b/res/drawable-xxhdpi/ic_action_history_backward_disabled.png
new file mode 100644
index 0000000..657d98f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_history_backward_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_backward_normal.png b/res/drawable-xxhdpi/ic_action_history_backward_normal.png
new file mode 100644
index 0000000..aa213e4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_history_backward_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_forward_active.png b/res/drawable-xxhdpi/ic_action_history_forward_active.png
new file mode 100644
index 0000000..78e5ada
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_history_forward_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_forward_disabled.png b/res/drawable-xxhdpi/ic_action_history_forward_disabled.png
new file mode 100644
index 0000000..ea58281
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_history_forward_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_forward_normal.png b/res/drawable-xxhdpi/ic_action_history_forward_normal.png
new file mode 100644
index 0000000..cda9c34
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_history_forward_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_reload_active.png b/res/drawable-xxhdpi/ic_action_reload_active.png
new file mode 100644
index 0000000..ec63dda
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_reload_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_reload_disabled.png b/res/drawable-xxhdpi/ic_action_reload_disabled.png
new file mode 100644
index 0000000..b4a554d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_reload_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_reload_normal.png b/res/drawable-xxhdpi/ic_action_reload_normal.png
new file mode 100644
index 0000000..a017453
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_reload_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_share_active.png b/res/drawable-xxhdpi/ic_action_share_active.png
new file mode 100644
index 0000000..b7cfdb0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_share_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_share_disabled.png b/res/drawable-xxhdpi/ic_action_share_disabled.png
new file mode 100644
index 0000000..edba395
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_share_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_share_normal.png b/res/drawable-xxhdpi/ic_action_share_normal.png
new file mode 100644
index 0000000..2ed118a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_share_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_active.png b/res/drawable-xxhdpi/ic_action_stop_active.png
new file mode 100644
index 0000000..ad0db49
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_stop_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_disabled.png b/res/drawable-xxhdpi/ic_action_stop_disabled.png
new file mode 100644
index 0000000..a525fbd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_stop_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_normal.png b/res/drawable-xxhdpi/ic_action_stop_normal.png
new file mode 100644
index 0000000..7459192
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_stop_normal.png
Binary files differ
diff --git a/res/drawable/ic_action_add_incognito.xml b/res/drawable/ic_action_add_incognito.xml
new file mode 100644
index 0000000..f4132c6
--- /dev/null
+++ b/res/drawable/ic_action_add_incognito.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_add_incognito_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_add_incognito_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_add_incognito_disabled" />
+
+ <item android:drawable="@drawable/ic_action_add_incognito_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_add_tab.xml b/res/drawable/ic_action_add_tab.xml
new file mode 100644
index 0000000..bb0b8f8
--- /dev/null
+++ b/res/drawable/ic_action_add_tab.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_add_tab_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_add_tab_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_add_tab_disabled" />
+
+ <item android:drawable="@drawable/ic_action_add_tab_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_bookmark.xml b/res/drawable/ic_action_bookmark.xml
new file mode 100644
index 0000000..bdce2c7
--- /dev/null
+++ b/res/drawable/ic_action_bookmark.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_bookmark_active" />
+
+ <item android:state_enabled="true" android:state_checked="true"
+ android:drawable="@drawable/ic_action_bookmark_checked" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_bookmark_checked" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_bookmark_disabled" />
+
+ <item android:drawable="@drawable/ic_action_bookmark_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_history_backward.xml b/res/drawable/ic_action_history_backward.xml
new file mode 100644
index 0000000..8557d76
--- /dev/null
+++ b/res/drawable/ic_action_history_backward.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_history_backward_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_history_backward_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_history_backward_disabled" />
+
+ <item android:drawable="@drawable/ic_action_history_backward_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_history_forward.xml b/res/drawable/ic_action_history_forward.xml
new file mode 100644
index 0000000..00e7925
--- /dev/null
+++ b/res/drawable/ic_action_history_forward.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_history_forward_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_history_forward_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_history_forward_disabled" />
+
+ <item android:drawable="@drawable/ic_action_history_forward_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_reload.xml b/res/drawable/ic_action_reload.xml
new file mode 100644
index 0000000..77cd12b
--- /dev/null
+++ b/res/drawable/ic_action_reload.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_reload_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_reload_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_reload_disabled" />
+
+ <item android:drawable="@drawable/ic_action_reload_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_share.xml b/res/drawable/ic_action_share.xml
new file mode 100644
index 0000000..ab997e8
--- /dev/null
+++ b/res/drawable/ic_action_share.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_share_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_share_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_share_disabled" />
+
+ <item android:drawable="@drawable/ic_action_share_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_stop.xml b/res/drawable/ic_action_stop.xml
new file mode 100644
index 0000000..bda0783
--- /dev/null
+++ b/res/drawable/ic_action_stop.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_stop_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_stop_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_stop_disabled" />
+
+ <item android:drawable="@drawable/ic_action_stop_normal" />
+
+</selector>
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index 09b442e..02a5a97 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -13,26 +13,55 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<FrameLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="@dimen/combo_paddingTop">
- <com.android.browser.view.BookmarkExpandableView
- android:id="@+id/grid"
+ android:orientation="vertical"
+ >
+
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:childDivider="@android:color/transparent"
- android:divider="@android:color/transparent"
- android:dividerHeight="0dp" />
- <TextView
- android:id="@android:id/empty"
- android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_weight="90"
+ android:paddingTop="@dimen/combo_paddingTop">
+ <com.android.browser.view.BookmarkExpandableView
+ android:id="@+id/grid"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:childDivider="@android:color/transparent"
+ android:divider="@android:color/transparent"
+ android:dividerHeight="0dp" />
+ <TextView
+ android:id="@android:id/empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/empty_bookmarks_folder"
+ android:visibility="gone" />
+ </FrameLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/empty_bookmarks_folder"
- android:visibility="gone" />
-</FrameLayout>
+ android:layout_weight="10"
+ android:layout_alignParentBottom="true" >
+
+ <Button
+ android:id="@+id/add_bookmark_button"
+ android:text="@string/add_new_bookmark"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <Button
+ android:id="@+id/new_bmfolder_button"
+ android:text="@string/new_folder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/four_button_menu_item.xml b/res/layout/four_button_menu_item.xml
index f1b2fd6..edefb53 100644
--- a/res/layout/four_button_menu_item.xml
+++ b/res/layout/four_button_menu_item.xml
@@ -12,35 +12,45 @@
<ImageButton
android:id="@+id/button_one"
- android:layout_width="59dp"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="24"
+ android:paddingStart="11dp"
android:paddingEnd="11dp"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
+ android:scaleType="center"
+ />
<ImageButton
android:id="@+id/button_two"
- android:layout_width="70dp"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="24"
android:paddingStart="11dp"
android:paddingEnd="11dp"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
+ android:scaleType="center"
+ />
<ImageButton
android:id="@+id/button_three"
- android:layout_width="70dp"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="24"
android:paddingStart="11dp"
android:paddingEnd="11dp"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
+ android:scaleType="center"
+ />
<ImageButton
android:id="@+id/button_four"
- android:layout_width="59dp"
+ android:layout_width="0dp"
android:layout_height="match_parent"
+ android:layout_weight="24"
android:paddingStart="11dp"
+ android:paddingEnd="11dp"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
-</LinearLayout>
\ No newline at end of file
+ android:scaleType="center"
+ />
+</LinearLayout>
diff --git a/res/layout/history.xml b/res/layout/history.xml
index f3adb51..53f70dc 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -14,23 +14,44 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
->
+ android:orientation="vertical" >
- <ExpandableListView
- android:id="@+id/history"
- android:layout_height="match_parent"
- android:layout_width="match_parent" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_weight="90"
+ android:layout_height="match_parent" >
- <TextView android:id="@android:id/empty"
- android:layout_width="wrap_content"
+ <ExpandableListView
+ android:id="@+id/history"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent" />
+
+ <TextView android:id="@android:id/empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/empty_history"
+ android:visibility="gone"
+ />
+
+ </FrameLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/empty_history"
- android:visibility="gone"
- />
+ android:layout_weight="10"
+ android:layout_alignParentBottom="true" >
-</FrameLayout>
+ <Button
+ android:id="@+id/clear_history_button"
+ android:text="@string/clear_history"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml
index 66bbb82..7247ee1 100644
--- a/res/layout/menu_item.xml
+++ b/res/layout/menu_item.xml
@@ -13,20 +13,30 @@
android:background="?android:attr/listChoiceBackgroundIndicator">
<TextView
android:id="@+id/menu_item_text"
- android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+ android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:gravity="center_vertical"
android:singleLine="true"
- android:paddingEnd="9dp" />
+ android:paddingLeft="16dp"
+ android:paddingEnd="9dp"
+ />
<view
- class="org.chromium.chrome.browser.appmenu.AppMenuItemIcon"
+ class="com.android.browser.appmenu.AppMenuItemIcon"
android:id="@+id/menu_item_icon"
android:layout_weight="0"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
- android:gravity="center_vertical" />
+ android:gravity="center_vertical"
+ />
+ <CheckBox
+ android:id="@+id/menu_item_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:tint="@color/black"
+ android:visible="false"
+ android:clickable="true" />
</LinearLayout>
diff --git a/res/layout/one_button_plus_menu_item.xml b/res/layout/one_button_plus_menu_item.xml
new file mode 100644
index 0000000..278611c
--- /dev/null
+++ b/res/layout/one_button_plus_menu_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_gravity="top|start"
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/button_one"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="90"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_two"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="6"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/three_button_menu_item.xml b/res/layout/three_button_menu_item.xml
index 5fb2d78..1895e43 100644
--- a/res/layout/three_button_menu_item.xml
+++ b/res/layout/three_button_menu_item.xml
@@ -14,23 +14,26 @@
android:id="@+id/button_one"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_weight="32"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
+ android:scaleType="center"
+ />
<ImageButton
android:id="@+id/button_two"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_weight="32"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
+ android:scaleType="center"
+ />
<ImageButton
android:id="@+id/button_three"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_weight="32"
android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center" />
-</LinearLayout>
\ No newline at end of file
+ android:scaleType="center"
+ />
+</LinearLayout>
diff --git a/res/layout/three_button_plus_menu_item.xml b/res/layout/three_button_plus_menu_item.xml
new file mode 100644
index 0000000..e0cc23b
--- /dev/null
+++ b/res/layout/three_button_plus_menu_item.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_gravity="top|start"
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/button_one"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="30"
+ android:paddingStart="11dp"
+ android:paddingEnd="11dp"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_two"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="30"
+ android:paddingStart="11dp"
+ android:paddingEnd="11dp"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_three"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="30"
+ android:paddingStart="11dp"
+ android:paddingEnd="11dp"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_four"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="6"
+ android:paddingStart="11dp"
+ android:paddingEnd="11dp"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ android:tint="@color/black" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/two_button_menu_item.xml b/res/layout/two_button_menu_item.xml
new file mode 100644
index 0000000..a2fc416
--- /dev/null
+++ b/res/layout/two_button_menu_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_gravity="top|start"
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/button_one"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="48"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_two"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="48"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/two_button_plus_menu_item.xml b/res/layout/two_button_plus_menu_item.xml
new file mode 100644
index 0000000..ae47f53
--- /dev/null
+++ b/res/layout/two_button_plus_menu_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_gravity="top|start"
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/button_one"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="45"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_two"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="45"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+
+ <ImageButton
+ android:id="@+id/button_three"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="6"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:scaleType="center"
+ />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 72f51ff..32dc6ca 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -17,96 +17,101 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group
android:id="@+id/MAIN_MENU">
- <item
- android:id="@+id/homepage_menu_id"
- android:title="@string/go_home"
- android:alphabeticShortcut=" " />
+
<group
android:id="@+id/NAV_MENU"
android:visible="@bool/menu_show_navigation">
- <item
- android:id="@+id/stop_reload_menu_id"
- android:alphabeticShortcut="r" />
- <item
- android:id="@+id/forward_menu_id"
- android:title="@string/forward"
- android:icon="@drawable/ic_menu_forward" />
+ <item>
+ <menu>
+ <item
+ android:id="@+id/forward_menu_id"
+ android:icon="@drawable/ic_action_history_forward"
+ android:title="@string/forward"/>
+ <item
+ android:id="@+id/bookmark_this_page_id"
+ android:icon="@drawable/ic_action_bookmark"
+ android:title="@string/save_to_bookmarks"/>
+ <item
+ android:id="@+id/stop_reload_menu_id"
+ android:icon="@drawable/ic_action_stop"
+ android:title="@string/stop"
+ android:visible="false"/>
+ </menu>
+ </item>
</group>
- <item
- android:id="@+id/back_menu_id"
- android:title="@string/back" />
- <item
- android:id="@+id/new_tab_menu_id"
- android:title="@string/new_tab"
- android:icon="@drawable/ic_new_window_holo_dark"
- android:showAsAction="never"
- android:alphabeticShortcut="n" />
- <item
- android:id="@+id/incognito_menu_id"
- android:title="@string/new_incognito_tab"
- android:icon="@drawable/ic_new_incognito_holo_dark" />
+
+ <item>
+ <menu>
+ <item
+ android:id="@+id/new_tab_menu_id"
+ android:title="@string/new_tab"
+ android:icon="@drawable/ic_action_add_tab" />
+ <item
+ android:id="@+id/incognito_menu_id"
+ android:title="@string/new_incognito_tab"
+ android:icon="@drawable/ic_action_add_incognito" />
+
+<!--
+ <item
+ android:id="@+id/close_other_tabs_id"
+ android:title="@string/close_other_tabs"
+ android:icon="@drawable/ic_tab_close" />
+-->
+ </menu>
+ </item>
+
<item
android:id="@+id/bookmarks_menu_id"
android:title="@string/bookmarks"
- android:icon="@drawable/ic_bookmarks_holo_dark"
android:showAsAction="never" />
<item
- android:id="@+id/add_bookmark_menu_id"
- android:title="@string/save_to_bookmarks"
- android:icon="@drawable/ic_bookmark_on_holo_dark"
- android:alphabeticShortcut="d"
- android:visible="@bool/menu_show_bookmarks" />
+ android:id="@+id/history_menu_id"
+ android:title="@string/tab_history" />
+ <item
+ android:id="@+id/snapshots_menu_id"
+ android:title="@string/tab_snapshots"
+ android:visible="false" />
+ <item
+ android:id="@+id/find_menu_id"
+ android:title="@string/find_on_page"/>
+
<group
android:id="@+id/LIVE_MENU">
<item
- android:id="@+id/share_page_menu_id"
- android:title="@string/share_page"
- android:icon="@drawable/ic_share_holo_dark"
- android:alphabeticShortcut="s" />
- <item
- android:id="@+id/find_menu_id"
- android:title="@string/find_on_page"/>
- <item
android:id="@+id/ua_desktop_menu_id"
android:checkable="true"
android:title="@string/ua_switcher_desktop" />
- </group>
- <group
- android:id="@+id/OFFLINE_READING">
- <item
+ <item
android:id="@+id/save_snapshot_menu_id"
android:title="@string/menu_save_snapshot" />
+ <item
+ android:id="@+id/add_to_homescreen"
+ android:title="@string/add_to_homescreen" />
+ <item
+ android:id="@+id/share_page_menu_id"
+ android:title="@string/share_page" />
</group>
+
<group
- android:id="@+id/SNAPSHOT_MENU">
+ android:id="@+id/SNAPSHOT_MENU"
+ android:visible="false">
<item
android:id="@+id/snapshot_go_live"
android:title="@string/snapshot_go_live" />
</group>
- <group
- android:id="@+id/COMBO_MENU">
- <item
- android:id="@+id/close_other_tabs_id"
- android:title="@string/close_other_tabs" />
- <item
- android:id="@+id/history_menu_id"
- android:title="@string/tab_history"
- android:alphabeticShortcut="h" />
- <item
- android:id="@+id/snapshots_menu_id"
- android:title="@string/tab_snapshots" />
- </group>
- <item
- android:id="@+id/page_info_menu_id"
- android:title="@string/page_info" />
<item
android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
- android:icon="@drawable/ic_settings_holo_dark"
android:alphabeticShortcut="p" />
- <item
- android:id="@+id/exit_menu_id"
- android:title="@string/exit" />
+
+ <group
+ android:id="@+id/QRD_MENU"
+ android:visible="false">
+ <item
+ android:id="@+id/exit_menu_id"
+ android:title="@string/exit" />
+ </group>
+
<item
android:id="@+id/about_menu_id"
android:title="@string/about" />
@@ -141,7 +146,9 @@
android:alphabeticShortcut="7" />
<item android:id="@+id/window_eight_menu_id"
android:alphabeticShortcut="8" />
+<!--
<item android:id="@+id/back_menu_id" />
+-->
<item android:id="@+id/goto_menu_id"
android:alphabeticShortcut="l" />
<item android:id="@+id/close_menu_id"
@@ -156,11 +163,11 @@
<!-- these items are toggled in and out of @+id/stop_reload_menu_id -->
<item android:id="@+id/stop_menu_id"
android:title="@string/stop"
- android:icon="@drawable/ic_menu_stop"
+ android:icon="@drawable/ic_action_stop"
android:visible="false" />
<item android:id="@+id/reload_menu_id"
android:title="@string/reload"
- android:icon="@drawable/ic_menu_refresh"
+ android:icon="@drawable/ic_action_reload"
android:visible="false" />
</menu>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 3d42508..6741b26 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -58,7 +58,7 @@
<!-- Preference widget area width (to the left of the text) -->
<dimen name="preference_widget_width">56dp</dimen>
<dimen name="nav_tab_spacing">8dp</dimen>
- <dimen name="menu_width">240dip</dimen>
+ <dimen name="menu_width">258dp</dimen>
<dimen name="menu_height">32dip</dimen>
<dimen name="toolbar_height">52dip</dimen>
<dimen name="tab_thumbnail_width">240dip</dimen>
@@ -70,4 +70,16 @@
<dimen name="nav_tab_text_small">14sp</dimen>
<dimen name="suggest_item_padding">8dp</dimen>
<dimen name="progress_bar_margin">-11dip</dimen>
+
+ <!-- Custom Menu dimensions -->
+ <dimen name="menu_negative_software_vertical_offset">0dp</dimen>
+ <!-- The amount to fade the edges of the menu to indicate more content is available
+ via scrolling. -->
+ <dimen name="menu_vertical_fade_distance">15dp</dimen>
+
+ <!-- Menu button dragging related dimensions -->
+ <dimen name="auto_scroll_full_velocity">500dp</dimen>
+ <dimen name="edge_swipe_in_slop">25dp</dimen>
+ <dimen name="edge_swipe_in_additional_slop">50dp</dimen>
+ <dimen name="edge_swipe_out_slop">18dp</dimen>
</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 211b02f..dfe4b3f 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -22,4 +22,5 @@
<item type="id" name="tab_view" />
<item type="id" name="position" />
<item type="id" name="load_object" />
+ <item type="id" name="menu_item_enter_anim_id" />
</resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 9fd97b2..0ce7ea7 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -31,4 +31,5 @@
<!-- The duration of the titlebar animation in millisecs -->
<integer name="titlebar_animation_duration">200</integer>
<integer name="netswitch_type_remind">1</integer>
+ <item type="fraction" format="fraction" name="menu_animation_pivot_x">95%</item>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61f4c36..67134a1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,6 +238,8 @@
<string name="copy_page_url">Copy page URL</string>
<!-- Menu item -->
<string name="share_page">Share page</string>
+ <!-- Menu item for saving link to homescreen -->
+ <string name="add_to_homescreen">Add to homescreen</string>
<!-- Menu item for saving a page for offline reading. This is a view-only snapshot of the page. [CHAR LIMIT=50] -->
<string name="menu_save_snapshot">Save for offline reading</string>
<!-- Dialog message that is shown while saving a page for offline reading. [CHAR LIMIT=50] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 17c5eb2..751451a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -93,4 +93,17 @@
<item name="android:imeOptions">flagNoExtractUi|actionNext</item>
<item name="android:singleLine">true</item>
</style>
+ <style name="OverflowMenuThemeBase" parent="BrowserTheme">
+ <item name="android:popupBackground">@null</item>
+ <item name="android:listDivider">@null</item>
+ <item name="android:listPreferredItemHeightSmall">48dp</item>
+ <item name="android:listPreferredItemPaddingStart">16dp</item>
+ <item name="android:listPreferredItemPaddingEnd">16dp</item>
+ <item name="android:textSize">16sp</item>
+ </style>
+ <style name="OverflowMenuTheme" parent="OverflowMenuThemeBase" />
+ <style name="OverflowMenuAnim">
+ <item name="android:windowEnterAnimation">@anim/menu_enter</item>
+ <item name="android:windowExitAnimation">@anim/menu_exit</item>
+ </style>
</resources>
