Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove touch event warnings

Browse Source 
Remove string format warning
This commit is contained in:
Deep
2021-03-07 19:14:02 -05:00
parent 6aeca83f30
commit 438e27e84d
25 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
+9 -6
View File
@@ -47,6 +47,7 @@ import android.widget.SpinnerAdapter;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
import android.annotation.SuppressLint;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.AppCompatImageView;
@@ -214,6 +215,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
mIconFetcher = new BraveRewardsHelper(BraveRewardsHelper.currentActiveChromeTabbedActivityTab());
this.window.setTouchInterceptor(new View.OnTouchListener() {
@SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouch(View v, MotionEvent event) {
if (event.getAction() == MotionEvent.ACTION_OUTSIDE) {
@@ -291,6 +293,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
tvBrBatWallet = root.findViewById(R.id.br_bat_wallet);
}
@SuppressLint("ClickableViewAccessibility")
private void initViewActionEvents() {
if (tvPublisherNotVerifiedSummary != null) {
tvPublisherNotVerifiedSummary.setOnTouchListener(new View.OnTouchListener() {
@@ -554,11 +557,11 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
tosTextSS.setSpan(privacyProtectionClickableSpan, privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
tosTextSS.setSpan(new ForegroundColorSpan(mActivity.getResources().getColor(R.color.brave_rewards_modal_theme_color)), privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
TextView tosAndPpText = braveRewardsOptInView.findViewById(R.id.tos_pp_text);
TextView tosAndPpText = braveRewardsOptInView.findViewById(R.id.brave_rewards_opt_in_tos_pp_text);
tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance());
tosAndPpText.setText(tosTextSS);
AppCompatImageView modalCloseButton = braveRewardsOptInView.findViewById(R.id.modal_close);
AppCompatImageView modalCloseButton = braveRewardsOptInView.findViewById(R.id.brave_rewards_opt_in_modal_close);
modalCloseButton.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -607,7 +610,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
tosTextSS.setSpan(privacyProtectionClickableSpan, privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
tosTextSS.setSpan(new ForegroundColorSpan(mActivity.getResources().getColor(R.color.brave_rewards_modal_theme_color)), privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById(R.id.tos_pp_text);
TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_tos_pp_text);
tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance());
tosAndPpText.setText(tosTextSS);
@@ -629,7 +632,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
showBraveRewardsOnboarding(root, true);
}
}));
AppCompatImageView modalCloseButton = braveRewardsOnboardingModalView.findViewById(R.id.modal_close);
AppCompatImageView modalCloseButton = braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_close);
modalCloseButton.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -681,7 +684,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
braveRewardsViewPager.setAdapter(braveRewardsOnboardingPagerAdapter);
TabLayout braveRewardsTabLayout = braveRewardsOnboardingView.findViewById(R.id.brave_rewards_tab_layout);
braveRewardsTabLayout.setupWithViewPager(braveRewardsViewPager, true);
AppCompatImageView modalCloseButton = braveRewardsOnboardingView.findViewById(R.id.modal_close);
AppCompatImageView modalCloseButton = braveRewardsOnboardingView.findViewById(R.id.brave_rewards_onboarding_layout_modal_close);
modalCloseButton.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -714,7 +717,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
}
}));
AppCompatImageView modalCloseButton =
braveRewardsWelcomeView.findViewById(R.id.modal_close);
braveRewardsWelcomeView.findViewById(R.id.brave_rewards_welcome_modal_close);
modalCloseButton.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java
+2
View File
@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.BraveRewardsPublisher.PublisherStatus;
import org.chromium.chrome.browser.app.BraveActivity;
import android.graphics.Bitmap;
import android.widget.ImageView;
import android.annotation.SuppressLint;
import org.chromium.chrome.browser.tab.Tab;
import java.math.RoundingMode;
@@ -315,6 +316,7 @@ public class BraveRewardsSiteBannerActivity extends Activity implements
sendDonationLayout = findViewById(R.id.send_donation_button);
}
@SuppressLint("ClickableViewAccessibility")
private void setPublisherNoteText(@PublisherStatus int pubStatus) {
String note_part1 = "";
if (pubStatus == BraveRewardsPublisher.CONNECTED) {
android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java
+2
View File
@@ -15,6 +15,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import java.util.Locale;
import android.annotation.SuppressLint;
import org.chromium.chrome.browser.BraveRewardsExternalWallet;
import org.chromium.chrome.browser.BraveRewardsHelper;
@@ -43,6 +44,7 @@ public class BraveRewardsVerifyWalletActivity extends Activity {
});
}
@SuppressLint("ClickableViewAccessibility")
void SetUpholdLinkHandler() {
TextView uphold_link = (TextView)findViewById(R.id.service_provider_txt);
final String part1 = getResources().getString(R.string.verify_wallet_service_note);
android/java/org/chromium/chrome/browser/custom_layout/NonSwipeableViewPager.java
+2
View File
@@ -12,6 +12,7 @@ import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator;
import android.widget.Scroller;
import android.annotation.SuppressLint;
import androidx.viewpager.widget.ViewPager;
@@ -34,6 +35,7 @@ public class NonSwipeableViewPager extends ViewPager {
return false;
}
@SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
// Never allow swiping to switch between pages
android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java
+2
View File
@@ -10,6 +10,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.annotation.SuppressLint;
import androidx.viewpager.widget.ViewPager;
@@ -54,6 +55,7 @@ public class VerticalViewPager extends ViewPager {
return toIntercept;
}
@SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent ev) {
final boolean toHandle = super.onTouchEvent(flipXY(ev));
android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java
+2
View File
@@ -25,6 +25,7 @@ import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.annotation.SuppressLint;
import androidx.annotation.ColorInt;
import androidx.annotation.DimenRes;
@@ -105,6 +106,7 @@ public class PopupWindowTooltip implements PopupWindow.OnDismissListener {
mPopupWindow.setOutsideTouchable(true);
mPopupWindow.setTouchable(true);
mPopupWindow.setTouchInterceptor(new View.OnTouchListener() {
@SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouch(View v, MotionEvent event) {
final int x = (int) event.getX();
android/java/org/chromium/chrome/browser/toolbar/bottom/BraveScrollingBottomViewResourceFrameLayout.java
+2
View File
@@ -8,6 +8,7 @@ package org.chromium.chrome.browser.toolbar.bottom;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.annotation.SuppressLint;
import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener;
import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.SwipeHandler;
@@ -43,6 +44,7 @@ public class BraveScrollingBottomViewResourceFrameLayout
return handledEvent || super.onInterceptTouchEvent(event);
}
@SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean handledEvent = false;
android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java
+2
View File
@@ -9,6 +9,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.LinearLayout;
import android.annotation.SuppressLint;
import androidx.annotation.Nullable;
@@ -45,6 +46,7 @@ public class BrowsingModeBottomToolbarLinearLayout extends LinearLayout {
return super.onInterceptTouchEvent(ev);
}
@SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
if (!mTouchEnabled) return true;
android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
+2 -2
View File
@@ -653,7 +653,7 @@ public abstract class BraveToolbarLayout extends ToolbarLayout
+ context.getResources().getString(R.string.privacy_policy).length(),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById(R.id.tos_pp_text);
TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_tos_pp_text);
tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance());
tosAndPpText.setText(tosTextSS);
@@ -678,7 +678,7 @@ public abstract class BraveToolbarLayout extends ToolbarLayout
}
}));
AppCompatImageView modalCloseButton =
braveRewardsOnboardingModalView.findViewById(R.id.modal_close);
braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_close);
modalCloseButton.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceDepositFragment.java
+7 -6
View File
@@ -136,10 +136,11 @@ public class BinanceDepositFragment extends Fragment {
ImageView currencyImageView = view.findViewById(R.id.currency_image);
TextView currencyText = view.findViewById(R.id.currency_text);
currencyText.setText(coinNetworkModel.getCoin()
+ (TextUtils.isEmpty(coinNetworkModel.getCoinDesc())
String currencyString = new StringBuilder(coinNetworkModel.getCoin()).append((TextUtils.isEmpty(coinNetworkModel.getCoinDesc())
? ""
: " (" + coinNetworkModel.getCoinDesc() + ")"));
: " (" + coinNetworkModel.getCoinDesc() + ")")).toString();
currencyText.setText(currencyString);
if (coinNetworkModel.getCoinRes() == 0) {
currencyImageView.setImageResource(R.drawable.eth);
currencyImageView.setVisibility(View.INVISIBLE);
@@ -218,10 +219,10 @@ public class BinanceDepositFragment extends Fragment {
});
if (selectedCoinNetworkModel != null) {
currencyTitleText.setText(selectedCoinNetworkModel.getCoin()
+ (TextUtils.isEmpty(selectedCoinNetworkModel.getCoinDesc())
String currencyTitleString = new StringBuilder(selectedCoinNetworkModel.getCoin()).append((TextUtils.isEmpty(selectedCoinNetworkModel.getCoinDesc())
? ""
: " (" + selectedCoinNetworkModel.getCoinDesc() + ")"));
: " (" + selectedCoinNetworkModel.getCoinDesc() + ")")).toString();
currencyTitleText.setText(currencyTitleString);
currencyAddressText.setText(String.format(
getActivity().getResources().getString(R.string.currency_address_text),
selectedCoinNetworkModel.getCoin()));
android/java/res/layout/activity_ntp_widget_stack.xml
+3 -1
View File
@@ -7,6 +7,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -15,7 +16,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/back_button"
android/java/res/layout/binance_deposit_item.xml
+2
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UseCompoundDrawables"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android/java/res/layout/binance_deposit_layout.xml
+2 -2
View File
@@ -5,7 +5,7 @@
You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/binance_deposit_layout"
android:layout_width="match_parent"
@@ -177,4 +177,4 @@
</androidx.cardview.widget.CardView>
</FrameLayout>
</merge>
android/java/res/layout/brave_rewards_onboarding_layout.xml
+1 -1
View File
@@ -128,7 +128,7 @@
</androidx.core.widget.NestedScrollView>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/modal_close"
android:id="@+id/brave_rewards_onboarding_layout_modal_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android/java/res/layout/brave_rewards_onboarding_modal.xml
+2 -2
View File
@@ -95,7 +95,7 @@
android:textColor="@color/brave_rewards_modal_theme_color"/>
<TextView
android:id="@+id/tos_pp_text"
android:id="@+id/brave_rewards_onboarding_modal_tos_pp_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
@@ -111,7 +111,7 @@
</androidx.core.widget.NestedScrollView>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/modal_close"
android:id="@+id/brave_rewards_onboarding_modal_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android/java/res/layout/brave_rewards_opt_in_layout.xml
+2 -2
View File
@@ -67,7 +67,7 @@
style="?android:attr/borderlessButtonStyle"/>
<TextView
android:id="@+id/tos_pp_text"
android:id="@+id/brave_rewards_opt_in_tos_pp_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
@@ -79,7 +79,7 @@
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/modal_close"
android:id="@+id/brave_rewards_opt_in_modal_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android/java/res/layout/brave_rewards_welcome_layout.xml
+1 -1
View File
@@ -88,7 +88,7 @@
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/modal_close"
android:id="@+id/brave_rewards_welcome_modal_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android/java/res/layout/brave_shields_main_layout.xml
+3 -1
View File
@@ -6,6 +6,7 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -29,7 +30,8 @@
android:layout_marginTop="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/site_favicon"
android/java/res/layout/brave_shields_option_layout.xml
+3 -1
View File
@@ -6,6 +6,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
@@ -14,7 +15,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/back_button"
android/java/res/layout/brave_shields_thank_you_layout.xml
+3 -1
View File
@@ -6,6 +6,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
@@ -15,7 +16,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="wrap_content"
android/java/res/layout/brave_shields_toggle_layout.xml
+3 -1
View File
@@ -6,6 +6,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -23,7 +24,8 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="16dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/toggle_text"
android/java/res/layout/bre_bottom_banner.xml
+3 -1
View File
@@ -5,6 +5,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/bre_banner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -18,7 +19,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:layout_width="0dp"
android/java/res/layout/fragment_rate_dialog.xml
+2
View File
@@ -113,6 +113,7 @@
android:textColor="@color/onboarding_gray"
android:textAllCaps="false"
android:visibility="invisible"
style="?android:attr/buttonBarButtonStyle"
android:gravity="center"/>
<Button
@@ -127,6 +128,7 @@
android:foreground="?attr/selectableItemBackground"
android:textColor="@color/onboarding_orange"
android:textAllCaps="false"
style="?android:attr/buttonBarButtonStyle"
android:gravity="center"/>
</LinearLayout>
android/java/res/layout/ntp_non_disruptive_banner.xml
+3 -1
View File
@@ -5,6 +5,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/non_disruptive_banner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -17,7 +18,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/ntp_banner_header"
android/java/res/layout/report_broken_site_layout.xml
+1
View File
@@ -66,6 +66,7 @@
android:text="@android:string/cancel"
android:textAllCaps="false"
android:textSize="16sp"
style="?android:attr/buttonBarButtonStyle"
android:textColor="@color/default_icon_color_tint_list"/>
<Button