photon gets merged with base

mozilla-release/mobile/android/app/src/main/res/color/action_bar_menu_item_colors.xml

@@ -6,17 +6,19 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Cliqz start -->
     <item gecko:state_private="true"
           android:state_enabled="false"
-          android:color="@color/photon_icon_private_disabled"/>
+          android:color="@color/cliqz_icon_disabled"/>
 
     <item gecko:state_private="true"
           android:state_enabled="true"
-          android:color="@color/photon_icon_private"/>
+          android:color="@color/cliqz_icon"/>
 
     <item android:state_enabled="false"
-          android:color="@color/photon_icon_disabled"/>
+          android:color="@color/cliqz_icon_disabled"/>
 
-    <item android:color="@color/photon_icon"/>
+    <item android:color="@color/cliqz_icon"/>
+    <!-- Cliqz end -->
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/color/search_suggestion_text.xml

@@ -6,8 +6,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
-    <item android:color="@color/photon_search_item_text_private"
+     <!-- Cliqz start -->
+    <item android:color="@color/photon_search_item_text"
           gecko:state_private="true"/>
+    <!-- Cliqz end -->
 
     <item android:color="@color/photon_search_item_text"/>
 

mozilla-release/mobile/android/app/src/main/res/color/tabs_counter_fg.xml

@@ -8,7 +8,9 @@
 
     <item android:color="@color/menu_item_tint_private"
           gecko:state_private="true"/>
-
-    <item android:color="@color/menu_item_tint"/>
+    <!-- Cliqz start -->
+    <!-- change tabs counter color -->
+    <item android:color="@android:color/white"/>
+    <!-- Cliqz end -->
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/color/tabs_counter_text.xml

@@ -8,7 +8,9 @@
 
     <item android:color="@color/photon_toolbar_text_color_private"
           gecko:state_private="true"/>
-
-    <item android:color="@color/photon_toolbar_text_color"/>
+    <!-- Cliqz start -->
+    <!-- change the counter text color -->
+    <item android:color="@color/photon_toolbar_text_color_private"/>
+    <!-- Cliqz end-->
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/color/two_line_page_row_title.xml

@@ -6,11 +6,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Cliqz begin -->
     <!-- private browsing mode -->
-    <item android:color="@color/photon_text_main_private"
+    <item android:color="@color/history_favorites_row_private"
           gecko:state_private="true"/>
 
     <!-- normal mode -->
-    <item android:color="@color/photon_text_main"/>
+    <item android:color="@color/history_favorites_row"/>
+    <!-- Cliqz end -->
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/color/two_line_page_row_url.xml

@@ -6,11 +6,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Cliqz start -->
     <!-- private browsing mode -->
-    <item android:color="@color/photon_text_secondary_private"
+    <item android:color="@color/history_favorites_row_private"
           gecko:state_private="true"/>
 
     <!-- normal mode -->
-    <item android:color="@color/photon_text_secondary"/>
+    <item android:color="@color/history_favorites_row"/>
+    <!-- Cliqz end -->
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/color/url_bar_image_color.xml

@@ -7,6 +7,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto">
     <item android:color="@color/photon_toolbar_image_tint_private" android:state_enabled="false" gecko:state_private="true" />
     <item android:color="@color/photon_toolbar_image_tint_private" android:state_enabled="true" gecko:state_private="true" />
-    <item android:color="@color/photon_toolbar_image_tint" android:state_enabled="false" gecko:state_private="false" />
-    <item android:color="@color/photon_toolbar_image_tint" />
+    <!-- Cliqz start -->
+    <!-- change tint color of url icons {3 dot menu, close icon} -->
+    <item android:color="@color/photon_toolbar_image_tint_private" android:state_enabled="false" gecko:state_private="false" />
+    <item android:color="@color/photon_toolbar_image_tint_private" />
+    <!-- Cliqz end -->
 </selector>

mozilla-release/mobile/android/app/src/main/res/color/url_bar_title.xml

@@ -7,7 +7,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- private browsing mode -->
+    <!-- Cliqz start o/
+    Cliqz does not have a different theme for private browsing mode
     <item android:color="@color/photon_text_main_private" gecko:state_private="true" />
+    /o Cliqz end -->
 
     <!-- normal mode -->
     <item android:color="@color/photon_text_main" />

mozilla-release/mobile/android/app/src/main/res/color/url_bar_title_highlight.xml

@@ -7,7 +7,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- private browsing mode -->
+    <!-- Cliqz Start -+>
+    Cliqz selection color for ghost tab should be same as it is in the normal tab.
     <item android:color="@color/photon_text_selected_highlight_private" gecko:state_private="true" />
+    <!+ Cliqz End -->
 
     <!-- normal mode -->
     <item android:color="@color/photon_text_selected_highlight" />

mozilla-release/mobile/android/app/src/main/res/drawable/search_list_bg.xml

@@ -5,8 +5,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@color/photon_content_bg_private"
+    <!-- Cliqz start -->
+    <!-- keep the background the same on normal and private mode -->
+    <item android:drawable="@color/photon_content_bg"
           gecko:state_private="true"/>
+    <!-- Cliqz end -->
 
     <item android:drawable="@color/photon_content_bg"/>
 </selector>

mozilla-release/mobile/android/app/src/main/res/drawable/search_list_selector.xml

@@ -7,5 +7,7 @@
     <item android:state_pressed="true"
           android:drawable="@color/photon_content_bg_pressed"/>
 
-    <item android:drawable="@color/photon_content_bg"/>
+     <!-- Cliqz start -->
+    <item android:drawable="@android:color/transparent"/>
+    <!-- Cliqz end -->
 </selector>

mozilla-release/mobile/android/app/src/main/res/drawable/search_list_selector_private.xml

@@ -7,5 +7,7 @@
     <item android:state_pressed="true"
           android:drawable="@color/photon_content_bg_private_pressed"/>
 
-    <item android:drawable="@color/photon_content_bg_private"/>
+    <!-- Cliqz start -->
+    <item android:drawable="@android:color/transparent"/>
+    <!-- Cliqz end -->
 </selector>

mozilla-release/mobile/android/app/src/main/res/drawable/security_mode_icon.xml

@@ -6,10 +6,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Cliqz start +->
+        use same icons for same private and normal mode -->
     <!-- private browsing mode -->
-    <item android:drawable="@drawable/security_mode_icon_pm" gecko:state_private="true" />
+    <item android:drawable="@drawable/site_security_icon" gecko:state_private="true" />
 
     <!-- normal mode -->
-    <item android:drawable="@drawable/security_mode_icon_nm" />
+    <item android:drawable="@drawable/site_security_icon" />
+    <!-- Cliqz end -->
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/drawable/url_bar_bg.xml

@@ -6,10 +6,15 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Cliqz start -->
+    <!-- change the url background color on private mode -->
+
     <!-- private browsing mode -->
-    <item android:drawable="@color/photon_browser_toolbar_bg_private" gecko:state_private="true" />
+    <item android:drawable="@color/background_ghost_mode" gecko:state_private="true" />
+
+    <!-- Cliqz end -->
 
     <!-- normal mode -->
-    <item android:drawable="@color/photon_browser_toolbar_bg" />
+    <item android:drawable="@color/url_bar" />
 
 </selector>

mozilla-release/mobile/android/app/src/main/res/layout-large-v11/browser_toolbar.xml

@@ -21,29 +21,33 @@
         android:duplicateParentState="true"
         android:focusable="false"/>
 
+    <!-- Cliqz start -->
     <org.mozilla.gecko.toolbar.BackButton
         android:id="@+id/back"
         style="@style/UrlBar.BackButton"
         android:layout_width="@dimen/tablet_nav_button_width"
         android:layout_height="@dimen/tablet_nav_button_width"
         android:layout_centerVertical="true"
+        android:contentDescription="@string/back"
+        android:src="@drawable/ic_menu_back"/>
+    <!--
         android:layout_margin="4dp"
         android:background="@drawable/url_bar_nav_button"
-        android:contentDescription="@string/back"
-        android:src="@drawable/ic_menu_back"
         gecko:borderColor="@color/nav_button_border_color"
-        gecko:borderColorPrivate="@color/nav_button_border_color_private"/>
-
+        gecko:borderColorPrivate="@color/nav_button_border_color_private"
+    -->
+    <!-- change the width and the height -->
     <org.mozilla.gecko.toolbar.ForwardButton
         android:id="@+id/forward"
         style="@style/UrlBar.ForwardButton"
-        android:layout_width="@dimen/tablet_nav_button_width_plus_half"
-        android:layout_height="@dimen/tablet_nav_button_width_plus_half"
+        android:layout_width="@dimen/tablet_nav_button_width"
+        android:layout_height="@dimen/tablet_nav_button_width"
         android:layout_centerVertical="true"
         android:layout_gravity="center_vertical"
         android:background="@drawable/url_bar_forward_button"
         android:contentDescription="@string/forward"
-        android:src="@drawable/ic_menu_forward"/>
+        gecko:srcCompat="@drawable/ic_menu_forward"/>
+    <!-- Cliqz end -->
 
     <org.mozilla.gecko.toolbar.ToolbarEditLayout
         android:id="@+id/edit_layout"
@@ -65,6 +69,18 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"/>
 
+    <!-- Cliqz start -->
+    <org.mozilla.gecko.toolbar.Ghosty
+        android:id="@+id/ghosty"
+        style="@style/UrlBar.Ghosty"
+        android:layout_centerVertical="true"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:background="@drawable/url_bar_action_button"
+        android:gravity="center_horizontal"
+        gecko:drawableTintList="@color/url_bar_image_color"/>
+    <!-- Cliqz end -->
+
     <org.mozilla.gecko.toolbar.ToolbarRoundButton
         android:id="@+id/tabs"
         style="@style/UrlBar.Tabs"
@@ -102,12 +118,14 @@
 
     <!-- We draw after the menu items so when they are hidden, the cancel button,
          which is thus drawn on top, may be pressed. -->
+    <!-- Cliqz start +->
+         move cancel button inside toolbar_edit_layout
     <org.mozilla.gecko.widget.themed.ThemedImageView
         android:id="@+id/edit_cancel"
         style="@style/UrlBar.EditCancel"
         android:contentDescription="@string/edit_mode_cancel"
         android:src="@drawable/close_edit_mode_selector"
         android:visibility="gone"
         tools:visibility="visible"/>
-
+    <!+- Cliqz end -->
 </merge>

mozilla-release/mobile/android/app/src/main/res/layout/browser_search.xml

@@ -15,17 +15,18 @@
         android:layout_height="wrap_content"
         android:layout="@layout/home_suggestion_prompt"/>
 
+    <!-- Cliqz start -->
     <view
         android:id="@+id/home_list_view"
         class="org.mozilla.gecko.home.BrowserSearch$HomeSearchListView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@drawable/search_list_bg"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@drawable/search_list_selector"
         tools:listitem="@layout/home_search_item_row"/>
+         <!--android:background="@drawable/search_list_bg"-->
 
     <!-- listSelector is too slow for showing pressed state
          so we set the pressed colors on the child. -->
@@ -39,5 +40,6 @@
         android:listSelector="@android:color/transparent"
         android:orientation="horizontal"
         android:paddingTop="1dp"/>
-
+        <!--android:background="@drawable/search_list_bg"-->
+    <!-- Cliqz end -->
 </LinearLayout>

mozilla-release/mobile/android/app/src/main/res/layout/browser_toolbar.xml

@@ -47,34 +47,46 @@
         android:src="@drawable/ic_overflow"
         gecko:showLWTBackground="true"/>
 
+    <!-- Cliqz start -->
+    <!-- add Ghosty Icon -->
+    <org.mozilla.gecko.toolbar.Ghosty
+        android:id="@+id/ghosty"
+        style="@style/UrlBar.Ghosty"
+        android:layout_centerVertical="true"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:background="@drawable/url_bar_action_button"
+        android:gravity="center_horizontal"
+        gecko:drawableTintList="@color/url_bar_image_color"/>
+
     <org.mozilla.gecko.toolbar.ToolbarRoundButton
         android:id="@+id/tabs"
         style="@style/UrlBar.Tabs"
         android:layout_alignWithParentIfMissing="true"
         android:background="@drawable/url_bar_action_button"
         gecko:showLWTBackground="true"/>
 
+    <!-- remove height property -->
     <org.mozilla.gecko.toolbar.TabCounter
         android:id="@+id/tabs_counter"
         style="@style/UrlBar.TabCounter"
-        android:layout_height="24dip"
         android:layout_centerVertical="true"
-        android:clipChildren="false"
-        android:clipToPadding="false"
         android:gravity="center_horizontal"
         gecko:drawableTintList="@color/url_bar_image_color"/>
 
     <!-- Note that the edit components are invisible so that the views
          depending on their location can properly layout. -->
-    <org.mozilla.gecko.toolbar.ToolbarRoundButton
+
+    <!-- move the cancel button inside the urlBar -->
+    <!--<org.mozilla.gecko.toolbar.ToolbarRoundButton
         android:id="@+id/edit_cancel"
         style="@style/UrlBar.EditCancel"
         android:background="@drawable/url_bar_action_button"
         android:contentDescription="@string/edit_mode_cancel"
         android:src="@drawable/ic_cancel"
         android:visibility="invisible"
-        gecko:showLWTBackground="true"/>
-
+        gecko:showLWTBackground="true"/> -->
+    <!-- Cliqz end -->
     <!-- The space to the left of the cancel button would be larger than the right because
          the url bar drawable contains some whitespace, so we compensate by removing
          some padding from the right (value determined through experimentation). -->

mozilla-release/mobile/android/app/src/main/res/layout/home_item_row.xml

@@ -2,11 +2,12 @@
 <!-- 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/. -->
-
+<!-- Cliqz Start -->
 <org.mozilla.gecko.home.TwoLinePageRow xmlns:android="http://schemas.android.com/apk/res/android"
                                        style="@style/Widget.TwoLinePageRow"
+                                       android:orientation="vertical"
                                        android:layout_width="match_parent"
-                                       android:layout_height="@dimen/wrap_content"
-                                       android:background="@android:color/transparent"
-                                       android:gravity="center_vertical"
-                                       android:minHeight="@dimen/search_item_min_height"/>
+                                       android:layout_height="wrap_content"
+                                       android:minHeight="@dimen/search_item_min_height"
+                                       android:gravity="center_vertical" />
+<!-- Cliqz End -->