From 8db0058208e72c62105f9cd85006c62960583a9b Mon Sep 17 00:00:00 2001 From: Deep Date: Mon, 10 May 2021 13:12:28 -0400 Subject: [PATCH] Remove BAP deprecation modal --- android/brave_java_resources.gni | 5 - android/brave_java_sources.gni | 1 - .../chrome/browser/BraveRewardsHelper.java | 12 -- .../browser/BraveRewardsPanelPopup.java | 1 + .../DeprecateBAPModalDialogFragment.java | 106 --------------- .../chrome/browser/app/BraveActivity.java | 121 +----------------- .../browser/shields/ShieldsTooltipEnum.java | 4 - .../toolbar/top/BraveToolbarLayout.java | 71 +--------- .../java/res/drawable/ic_warning_triangle.xml | 10 -- .../res/drawable/ic_warning_triangle_2.xml | 10 -- .../res/drawable/rewards_modal_background.xml | 12 -- .../drawable/rewards_tooltip_background.xml | 13 -- .../fragment_deprecate_bap_modal_dialog.xml | 79 ------------ android/java/res/values/brave_colors.xml | 1 - .../android/strings/android_brave_strings.grd | 14 -- 15 files changed, 3 insertions(+), 457 deletions(-) delete mode 100644 android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java delete mode 100644 android/java/res/drawable/ic_warning_triangle.xml delete mode 100644 android/java/res/drawable/ic_warning_triangle_2.xml delete mode 100644 android/java/res/drawable/rewards_modal_background.xml delete mode 100644 android/java/res/drawable/rewards_tooltip_background.xml delete mode 100644 android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 7a6eb775e662..673169daf7e0 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -614,8 +614,6 @@ brave_java_resources = [ "java/res/drawable/ic_toggle_up.xml", "java/res/drawable/ic_wallet_add.xml", "java/res/drawable/ic_warning_circle.xml", - "java/res/drawable/ic_warning_triangle.xml", - "java/res/drawable/ic_warning_triangle_2.xml", "java/res/drawable/image_credit_rounded_shape.xml", "java/res/drawable/modern_toolbar_background_grey_end_segment.xml", "java/res/drawable/ntp_widget_indicator_bg.xml", @@ -634,8 +632,6 @@ brave_java_resources = [ "java/res/drawable/rewards_button_purple_border.xml", "java/res/drawable/rewards_button_summary.xml", "java/res/drawable/rewards_image_button.xml", - "java/res/drawable/rewards_modal_background.xml", - "java/res/drawable/rewards_tooltip_background.xml", "java/res/drawable/rounded_corners.xml", "java/res/drawable/rounded_filled.xml", "java/res/drawable/rounded_filled_binance.xml", @@ -721,7 +717,6 @@ brave_java_resources = [ "java/res/layout/fragment_brave_rewards_onboarding.xml", "java/res/layout/fragment_cross_promotional_modal_dialog.xml", "java/res/layout/fragment_crypto_widget_bottom_sheet_dialog.xml", - "java/res/layout/fragment_deprecate_bap_modal_dialog.xml", "java/res/layout/fragment_onboarding_v2.xml", "java/res/layout/fragment_qr_code_share.xml", "java/res/layout/fragment_rate_dialog.xml", diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index a087901073cd..51b905749341 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -36,7 +36,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/BraveSyncReflectionUtils.java", "../../brave/android/java/org/chromium/chrome/browser/BraveUphold.java", "../../brave/android/java/org/chromium/chrome/browser/CrossPromotionalModalDialogFragment.java", - "../../brave/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/InternetConnection.java", "../../brave/android/java/org/chromium/chrome/browser/QRCodeShareDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/SetDefaultBrowserActivity.java", diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index edb8b3caea65..51694af2e3a8 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -54,7 +54,6 @@ public class BraveRewardsHelper implements LargeIconBridge.LargeIconCallback{ private static final String PREF_SHOW_ONBOARDING_MINI_MODAL = "show_onboarding_mini_modal"; private static final String PREF_NEXT_REWARDS_ONBOARDING_MODAL_DATE = "next_rewards_onboarding_modal_date"; - private static final String PREF_NEXT_BAP_MODAL_DATE = "next_bap_modal_date"; private static final String PREF_REWARDS_ENV_CHANGE = "rewards_env_change"; private static final String PREF_REWARDS_ONBOARDING_MODAL = "rewards_onboarding_modal"; private static final int FAVICON_CIRCLE_MEASUREMENTS = 70; // dp @@ -103,17 +102,6 @@ public static void setNextRewardsOnboardingModalDate(long nextDate) { sharedPreferencesEditor.apply(); } - public static long getNextBAPModalDate() { - return ContextUtils.getAppSharedPreferences().getLong(PREF_NEXT_BAP_MODAL_DATE, 0); - } - - public static void setNextBAPModalDate(long nextDate) { - SharedPreferences.Editor sharedPreferencesEditor = - ContextUtils.getAppSharedPreferences().edit(); - sharedPreferencesEditor.putLong(PREF_NEXT_BAP_MODAL_DATE, nextDate); - sharedPreferencesEditor.apply(); - } - public static void setRewardsOnboardingModalShown(boolean isShown) { SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java index 515c002d5b53..a0096f9cc7fd 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java @@ -2066,6 +2066,7 @@ public void updateDrawState(@NonNull TextPaint ds) { loginPopupWindow.setContentView(loginPopupView); view.post(new Runnable() { + @Override public void run() { if (SysUtils.isLowEndDevice()) { loginPopupWindow.setAnimationStyle(0); diff --git a/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java b/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java deleted file mode 100644 index ded1f01f2b91..000000000000 --- a/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright (c) 2021 The Brave Authors. All rights reserved. - * 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/. - */ - -package org.chromium.chrome.browser; - -import android.content.DialogInterface; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.os.Bundle; -import android.util.DisplayMetrics; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.widget.Button; -import android.widget.LinearLayout; - -import androidx.appcompat.widget.AppCompatImageView; -import androidx.fragment.app.DialogFragment; - -import org.chromium.chrome.R; -import org.chromium.chrome.browser.util.ConfigurationUtils; -import org.chromium.ui.base.DeviceFormFactor; - -public class DeprecateBAPModalDialogFragment - extends DialogFragment implements View.OnClickListener { - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - setDialogParams(); - } - - @Override - public void onResume() { - super.onResume(); - getDialog().setOnKeyListener(new DialogInterface.OnKeyListener() { - @Override - public boolean onKey(android.content.DialogInterface dialog, int keyCode, - android.view.KeyEvent event) { - if ((keyCode == android.view.KeyEvent.KEYCODE_BACK)) { - dismiss(); - return true; - } else - return false; - } - }); - setDialogParams(); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setStyle(STYLE_NO_TITLE, 0); - getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } - - @Override - public void onDestroyView() { - getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); - super.onDestroyView(); - } - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_deprecate_bap_modal_dialog, container, false); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - Button mDoneButton = view.findViewById(R.id.btn_done); - mDoneButton.setOnClickListener(this); - } - - @Override - public void onClick(View view) { - dismiss(); - } - - private void setDialogParams() { - DisplayMetrics displayMetrics = new DisplayMetrics(); - getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - int mDeviceHeight = displayMetrics.heightPixels; - int mDeviceWidth = displayMetrics.widthPixels; - - WindowManager.LayoutParams params = getDialog().getWindow().getAttributes(); - boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(getActivity()); - boolean isLandscape = ConfigurationUtils.isLandscape(getActivity()); - if (isTablet) { - params.width = (int) (0.5 * mDeviceWidth); - } else { - if (isLandscape) { - params.width = (int) (0.5 * mDeviceWidth); - } else { - params.width = (int) (0.9 * mDeviceWidth); - } - } - params.height = LinearLayout.LayoutParams.WRAP_CONTENT; - getDialog().getWindow().setAttributes(params); - } -} diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index b1c465fa49d7..a0fe4fef7256 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -44,23 +44,19 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ApplicationLifetime; import org.chromium.chrome.browser.BraveConfig; -import org.chromium.chrome.browser.BraveFeatureList; import org.chromium.chrome.browser.BraveHelper; import org.chromium.chrome.browser.BraveRelaunchUtils; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; -import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveSyncReflectionUtils; import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.CrossPromotionalModalDialogFragment; -import org.chromium.chrome.browser.DeprecateBAPModalDialogFragment; import org.chromium.chrome.browser.LaunchIntentDispatcher; import org.chromium.chrome.browser.SetDefaultBrowserActivity; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.brave_stats.BraveStatsUtil; import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent; -import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.informers.BraveAndroidSyncDisabledInformer; import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService; @@ -111,8 +107,7 @@ * Brave's extension for ChromeActivity */ @JNINamespace("chrome::android") -public abstract class BraveActivity - extends ChromeActivity implements BraveRewardsObserver { +public abstract class BraveActivity extends ChromeActivity { public static final int SITE_BANNER_REQUEST_CODE = 33; public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34; public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35; @@ -145,12 +140,9 @@ public abstract class BraveActivity public static final String ANDROID_PACKAGE_NAME = "android"; public static final String BRAVE_BLOG_URL = "http://www.brave.com/blog"; - private static final String JAPAN_COUNTRY_CODE = "JP"; - // Explicitly declare this variable to avoid build errors. // It will be removed in asm and parent variable will be used instead. protected ObservableSupplier mTabModelProfileSupplier; - private BraveRewardsNativeWorker mBraveRewardsNativeWorker; private static final List yandexRegions = Arrays.asList("AM", "AZ", "BY", "KG", "KZ", "MD", "RU", "TJ", "TM", "UZ"); @@ -164,20 +156,6 @@ public BraveActivity() { public void onResumeWithNative() { super.onResumeWithNative(); BraveActivityJni.get().restartStatsUpdater(); - if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) - && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) { - if (mBraveRewardsNativeWorker == null) - mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance(); - mBraveRewardsNativeWorker.AddObserver(this); - } - } - - @Override - public void onPauseWithNative() { - super.onPauseWithNative(); - if (mBraveRewardsNativeWorker != null) { - mBraveRewardsNativeWorker.RemoveObserver(this); - } } @Override @@ -410,69 +388,6 @@ public void finishNativeInitialization() { calender.getTimeInMillis()); } checkSetDefaultBrowserModal(); - if (mBraveRewardsNativeWorker != null && mBraveRewardsNativeWorker.isRewardsEnabled() - && ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) - && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) { - mBraveRewardsNativeWorker.StartProcess(); - } - } - - @Override - public void OnRewardsParameters(int errorCode) { - if (errorCode == BraveRewardsNativeWorker.LEDGER_OK && mBraveRewardsNativeWorker != null - && mBraveRewardsNativeWorker.GetWalletBalance() != null - && mBraveRewardsNativeWorker.GetWalletBalance().getTotal() > 0) { - checkForDeprecateBAPDialog(); - } - } - - @Override - public void OnStartProcess() { - mBraveRewardsNativeWorker.GetRewardsParameters(); - } - - private void checkForDeprecateBAPDialog() { - String countryCode = Locale.getDefault().getCountry(); - if (countryCode.equals(JAPAN_COUNTRY_CODE) && !isRewardsPanelOpened() - && System.currentTimeMillis() > BraveRewardsHelper.getNextBAPModalDate()) { - Calendar toDayCalendar = Calendar.getInstance(); - Date todayDate = toDayCalendar.getTime(); - - Calendar march6Calendar = Calendar.getInstance(); - march6Calendar.set(Calendar.DAY_OF_MONTH, 6); - march6Calendar.set(Calendar.YEAR, 2021); - march6Calendar.set(Calendar.MONTH, 2); - march6Calendar.set(Calendar.HOUR_OF_DAY, 0); - march6Calendar.set(Calendar.MINUTE, 0); - march6Calendar.set(Calendar.SECOND, 0); - march6Calendar.set(Calendar.MILLISECOND, 0); - Date march6Date = march6Calendar.getTime(); - - Calendar march13Calendar = Calendar.getInstance(); - march13Calendar.set(Calendar.DAY_OF_MONTH, 13); - march13Calendar.set(Calendar.YEAR, 2021); - march13Calendar.set(Calendar.MONTH, 2); - march13Calendar.set(Calendar.HOUR_OF_DAY, 0); - march13Calendar.set(Calendar.MINUTE, 0); - march13Calendar.set(Calendar.SECOND, 0); - march13Calendar.set(Calendar.MILLISECOND, 0); - Date march13Date = march13Calendar.getTime(); - - boolean shouldSetNextDate = false; - if (todayDate.compareTo(march6Date) < 0) { - showRewardsTooltip(); - shouldSetNextDate = true; - } else if (todayDate.compareTo(march6Date) > 0 - && todayDate.compareTo(march13Date) < 0) { - showDeprecateBAPDialog(); - shouldSetNextDate = true; - } - if (shouldSetNextDate) { - Calendar calender = toDayCalendar; - calender.add(Calendar.DATE, DAYS_1); - BraveRewardsHelper.setNextBAPModalDate(calender.getTimeInMillis()); - } - } } private void checkSetDefaultBrowserModal() { @@ -587,14 +502,6 @@ public void hideRewardsOnboardingIcon() { } } - public void showRewardsTooltip() { - BraveToolbarLayout layout = (BraveToolbarLayout) findViewById(R.id.toolbar); - assert layout != null; - if (layout != null) { - layout.showRewardsTooltip(); - } - } - private void createNotificationChannel() { Context context = ContextUtils.getApplicationContext(); // Create the NotificationChannel, but only on API 26+ because @@ -715,24 +622,6 @@ public void openRewardsPanel() { } } - public boolean isRewardsPanelOpened() { - BraveToolbarLayout layout = (BraveToolbarLayout) findViewById(R.id.toolbar); - assert layout != null; - if (layout != null) { - return layout.isRewardsPanelOpened(); - } - return false; - } - - public boolean isShieldsTooltipShown() { - BraveToolbarLayout layout = (BraveToolbarLayout) findViewById(R.id.toolbar); - assert layout != null; - if (layout != null) { - return layout.isShieldsTooltipShown(); - } - return false; - } - public Tab selectExistingTab(String url) { Tab tab = getActivityTab(); if (tab != null && tab.getUrlString().equals(url)) { @@ -777,14 +666,6 @@ private void showCrossPromotionalDialog() { mCrossPromotionalModalDialogFragment.show(getSupportFragmentManager(), "CrossPromotionalModalDialogFragment"); } - public void showDeprecateBAPDialog() { - DeprecateBAPModalDialogFragment mDeprecateBAPModalDialogFragment = - new DeprecateBAPModalDialogFragment(); - mDeprecateBAPModalDialogFragment.setCancelable(false); - mDeprecateBAPModalDialogFragment.show( - getSupportFragmentManager(), "DeprecateBAPModalDialogFragment"); - } - static public ChromeTabbedActivity getChromeTabbedActivity() { for (Activity ref : ApplicationStatus.getRunningActivities()) { if (!(ref instanceof ChromeTabbedActivity)) continue; diff --git a/android/java/org/chromium/chrome/browser/shields/ShieldsTooltipEnum.java b/android/java/org/chromium/chrome/browser/shields/ShieldsTooltipEnum.java index 093f0c1e6ad0..98141c78efbb 100644 --- a/android/java/org/chromium/chrome/browser/shields/ShieldsTooltipEnum.java +++ b/android/java/org/chromium/chrome/browser/shields/ShieldsTooltipEnum.java @@ -23,9 +23,6 @@ public enum ShieldsTooltipEnum { HTTPS_UPGRADE_TOOLTIP(ShieldsTooltipEnumConstants.HTTPS_UPGRADE_TOOLTIP, R.string.tooltip_title_4, R.string.tooltip_text_4, R.color.shields_tooltip_arrow_color_2, R.drawable.shields_tooltip_background_2), - BAP_DEPRECATION_TOOLTIP(ShieldsTooltipEnumConstants.BAP_DEPRECATION_TOOLTIP, - R.string.rewards_tooltip_title, R.string.rewards_tooltip_text, - R.color.rewards_tooltip_arrow_color, R.drawable.rewards_tooltip_background), BRAVE_SHARE_STATS_TIER1_TOOLTIP(ShieldsTooltipEnumConstants.BRAVE_SHARE_STATS_TIER1_TOOLTIP, R.string.brave_stats_share_tooltip_tier1_title, R.string.brave_stats_share_tooltip_special_text, R.color.shields_tooltip_arrow_color_2, @@ -102,7 +99,6 @@ interface ShieldsTooltipEnumConstants { static final int VIDEO_ADS_BLOCKED_TOOLTIP = 1; static final int ADS_TRACKER_BLOCKED_TOOLTIP = 2; static final int HTTPS_UPGRADE_TOOLTIP = 3; - static final int BAP_DEPRECATION_TOOLTIP = 4; static final int BRAVE_SHARE_STATS_TIER1_TOOLTIP = 5; static final int BRAVE_SHARE_STATS_TIER2_TOOLTIP = 6; static final int BRAVE_SHARE_STATS_TIER3_TOOLTIP = 7; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index 2a452dc0aafe..a30307c49f28 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -159,7 +159,6 @@ public abstract class BraveToolbarLayout extends ToolbarLayout private boolean mIsInitialNotificationPosted; // initial red circle notification private PopupWindowTooltip mShieldsPopupWindowTooltip; - private PopupWindowTooltip mRewardsPopupWindowTooltip; private boolean mIsBottomToolbarVisible; @@ -374,8 +373,7 @@ public void onPageLoadFinished(final Tab tab, GURL url) { OnboardingPrefManager.getInstance().setTimeSavedNotificationStarted(true); } if (mBraveShieldsButton != null && mBraveShieldsButton.isShown() - && mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing() - && !isRewardsTooltipShown() && !isRewardsPanelOpened()) { + && mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing()) { checkForTooltip(tab); } } @@ -639,51 +637,6 @@ public void onClick(View view) { } } - public void showRewardsTooltip() { - ShieldsTooltipEnum shieldsTooltipEnum = ShieldsTooltipEnum.BAP_DEPRECATION_TOOLTIP; - mRewardsPopupWindowTooltip = new PopupWindowTooltip.Builder(getContext()) - .anchorView(mBraveRewardsButton) - .arrowColor(getContext().getResources().getColor( - shieldsTooltipEnum.getArrowColor())) - .gravity(Gravity.BOTTOM) - .dismissOnOutsideTouch(true) - .dismissOnInsideTouch(false) - .modal(true) - .contentView(R.layout.brave_shields_tooltip_layout) - .build(); - mRewardsPopupWindowTooltip.findViewById(R.id.shields_tooltip_layout) - .setBackgroundDrawable(ContextCompat.getDrawable( - getContext(), shieldsTooltipEnum.getTooltipBackground())); - - Button btnTooltip = mRewardsPopupWindowTooltip.findViewById(R.id.btn_tooltip); - btnTooltip.setText(getContext().getResources().getString(R.string.menu_learn_more)); - btnTooltip.setVisibility(View.VISIBLE); - btnTooltip.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - dismissRewardsTooltip(); - if (BraveActivity.getBraveActivity() != null) - BraveActivity.getBraveActivity().showDeprecateBAPDialog(); - } - }); - - TextView tooltipTitle = mRewardsPopupWindowTooltip.findViewById(R.id.txt_tooltip_title); - SpannableStringBuilder ssb = - new SpannableStringBuilder(new StringBuilder("\t\t") - .append(getContext().getResources().getString( - shieldsTooltipEnum.getTitle())) - .toString()); - ssb.setSpan(new ImageSpan( - getContext(), R.drawable.ic_warning_triangle, ImageSpan.ALIGN_BASELINE), - 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - tooltipTitle.setText(ssb, TextView.BufferType.SPANNABLE); - - TextView tooltipText = mRewardsPopupWindowTooltip.findViewById(R.id.txt_tooltip_text); - tooltipText.setText(getContext().getResources().getString(shieldsTooltipEnum.getText())); - - mRewardsPopupWindowTooltip.show(); - } - public void dismissShieldsTooltip() { if (mShieldsPopupWindowTooltip != null && mShieldsPopupWindowTooltip.isShowing()) { mShieldsPopupWindowTooltip.dismiss(); @@ -698,24 +651,9 @@ public void reopenShieldsPanel() { } } - public void dismissRewardsTooltip() { - if (mRewardsPopupWindowTooltip != null && mRewardsPopupWindowTooltip.isShowing()) { - mRewardsPopupWindowTooltip.dismiss(); - mRewardsPopupWindowTooltip = null; - } - } - - public boolean isRewardsTooltipShown() { - if (mRewardsPopupWindowTooltip != null) { - return mRewardsPopupWindowTooltip.isShowing(); - } - return false; - } - @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - dismissRewardsTooltip(); dismissShieldsTooltip(); reopenShieldsPanel(); } @@ -1133,13 +1071,6 @@ public void openRewardsPanel() { onClick(mBraveRewardsButton); } - public boolean isRewardsPanelOpened() { - if (mRewardsPopup != null) { - return mRewardsPopup.isShowing(); - } - return false; - } - public boolean isShieldsTooltipShown() { if (mShieldsPopupWindowTooltip != null) { return mShieldsPopupWindowTooltip.isShowing(); diff --git a/android/java/res/drawable/ic_warning_triangle.xml b/android/java/res/drawable/ic_warning_triangle.xml deleted file mode 100644 index bcb161fe6649..000000000000 --- a/android/java/res/drawable/ic_warning_triangle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/android/java/res/drawable/ic_warning_triangle_2.xml b/android/java/res/drawable/ic_warning_triangle_2.xml deleted file mode 100644 index 9f37f31c82bf..000000000000 --- a/android/java/res/drawable/ic_warning_triangle_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/android/java/res/drawable/rewards_modal_background.xml b/android/java/res/drawable/rewards_modal_background.xml deleted file mode 100644 index 19d5431ed93a..000000000000 --- a/android/java/res/drawable/rewards_modal_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/android/java/res/drawable/rewards_tooltip_background.xml b/android/java/res/drawable/rewards_tooltip_background.xml deleted file mode 100644 index dc0e9b85ae63..000000000000 --- a/android/java/res/drawable/rewards_tooltip_background.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml b/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml deleted file mode 100644 index ece118f65625..000000000000 --- a/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - -