From 1a24fdfb5cc27d6b57c44d24cc4564f3bb7b14b9 Mon Sep 17 00:00:00 2001 From: Stefano Pacifici Date: Mon, 8 Jul 2019 15:45:19 +0200 Subject: [PATCH] AP-389 adds Tabs menu entry for Lumen --- .../java/com/cliqz/browser/widget/OverFlowMenu.java | 11 +++++++++++ app/src/main/res/values/ids.xml | 1 + 2 files changed, 12 insertions(+) diff --git a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java index 350a7e7de..aa4a713dc 100644 --- a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java +++ b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java @@ -92,6 +92,7 @@ private enum Entries { ACTIONS(EntryType.ACTIONS, -1, -1), NEW_TAB(EntryType.REGULAR, R.id.new_tab_menu_button, R.string.action_new_tab), NEW_INCOGNITO_TAB(EntryType.REGULAR, R.id.new_incognito_tab_menu_button, R.string.action_incognito), + TABS(EntryType.REGULAR, R.id.tabs_menu_button, R.string.tabs_word), GO_TO_FAVORITES(EntryType.REGULAR, R.id.go_to_favorites_button, R.string.favorites), SEARCH_IN_PAGE(EntryType.REGULAR, R.id.search_on_page_menu_button, R.string.action_search_on_page), @@ -118,6 +119,7 @@ private enum Entries { Entries.ACTIONS, Entries.NEW_TAB, Entries.NEW_INCOGNITO_TAB, + Entries.TABS, Entries.SEARCH_IN_PAGE, Entries.GO_TO_FAVORITES, Entries.DESKTOP_PAIRING, @@ -133,6 +135,7 @@ private enum Entries { Entries.ACTIONS, Entries.NEW_TAB, Entries.NEW_INCOGNITO_TAB, + Entries.TABS, Entries.SEARCH_IN_PAGE, Entries.DESKTOP_PAIRING, Entries.SEND_TAB_TO_DESKTOP, @@ -327,6 +330,9 @@ private void prepareEntries() { if (BuildConfig.IS_LUMEN) { entries.remove(Entries.DESKTOP_PAIRING); } + if (BuildConfig.IS_NOT_LUMEN) { + entries.remove(Entries.TABS); + } if (!BuildConfig.DEBUG) { entries.remove(Entries.REACT_DEBUG); } @@ -569,6 +575,11 @@ public void onItemClick(AdapterView parent, View view, int position, long id) state.getMode() == Mode.SEARCH ? "cards" : "web"); bus.post(new BrowserEvents.NewTab(false)); break; + case TABS: + telemetry.sendMainMenuSignal(TelemetryKeys.TAB_COUNT, isIncognitoMode(), + state.getMode() == Mode.SEARCH ? "cards" : "web"); + bus.post(new Messages.GoToOverview()); + break; case SEARCH_IN_PAGE: telemetry.sendMainMenuSignal(TelemetryKeys.PAGE_SEARCH, isIncognitoMode(), state.getMode() == Mode.SEARCH ? "cards" : "web"); diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index b9f63fc5e..9a1b38d21 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -41,4 +41,5 @@ +