| OLD | NEW |
| 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- | 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- |
| 2 * This Source Code Form is subject to the terms of the Mozilla Public | 2 * This Source Code Form is subject to the terms of the Mozilla Public |
| 3 * License, v. 2.0. If a copy of the MPL was not distributed with this | 3 * License, v. 2.0. If a copy of the MPL was not distributed with this |
| 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
| 5 | 5 |
| 6 package org.mozilla.gecko; | 6 package org.mozilla.gecko; |
| 7 | 7 |
| 8 import android.Manifest; | 8 import android.Manifest; |
| 9 import android.annotation.TargetApi; | 9 import android.annotation.TargetApi; |
| 10 import android.app.Activity; | 10 import android.app.Activity; |
| (...skipping 3454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3465 } | 3465 } |
| 3466 | 3466 |
| 3467 /** | 3467 /** |
| 3468 * Adds a WebExtension browser action to the menu. | 3468 * Adds a WebExtension browser action to the menu. |
| 3469 */ | 3469 */ |
| 3470 private void addBrowserActionMenuItem(final BrowserActionItemInfo info) { | 3470 private void addBrowserActionMenuItem(final BrowserActionItemInfo info) { |
| 3471 if (mBrowserActionItemsCache == null) { | 3471 if (mBrowserActionItemsCache == null) { |
| 3472 mBrowserActionItemsCache = new ArrayList<BrowserActionItemInfo>(); | 3472 mBrowserActionItemsCache = new ArrayList<BrowserActionItemInfo>(); |
| 3473 } | 3473 } |
| 3474 | 3474 |
| 3475 // We don't want to show extensions as items in the menu |
| 3476 // See https://issues.adblockplus.org/ticket/7198 |
| 3477 if (true) return; |
| 3478 |
| 3475 // Mark it as added if the menu was ready. | 3479 // Mark it as added if the menu was ready. |
| 3476 info.added = (mMenu != null); | 3480 info.added = (mMenu != null); |
| 3477 | 3481 |
| 3478 // Always cache so we can rebuild after a locale switch. | 3482 // Always cache so we can rebuild after a locale switch. |
| 3479 mBrowserActionItemsCache.add(info); | 3483 mBrowserActionItemsCache.add(info); |
| 3480 | 3484 |
| 3481 if (mMenu == null) { | 3485 if (mMenu == null) { |
| 3482 return; | 3486 return; |
| 3483 } | 3487 } |
| 3484 | 3488 |
| (...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4601 @Override | 4605 @Override |
| 4602 public void onLightweightThemeReset() { | 4606 public void onLightweightThemeReset() { |
| 4603 refreshStatusBarColor(); | 4607 refreshStatusBarColor(); |
| 4604 } | 4608 } |
| 4605 | 4609 |
| 4606 private void refreshStatusBarColor() { | 4610 private void refreshStatusBarColor() { |
| 4607 final boolean isPrivate = mBrowserToolbar.isPrivateMode(); | 4611 final boolean isPrivate = mBrowserToolbar.isPrivateMode(); |
| 4608 WindowUtil.setStatusBarColor(BrowserApp.this, isPrivate); | 4612 WindowUtil.setStatusBarColor(BrowserApp.this, isPrivate); |
| 4609 } | 4613 } |
| 4610 } | 4614 } |
| OLD | NEW |