diff --git a/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java index 82044f40143..516487771a5 100644 --- a/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java @@ -68,6 +68,7 @@ public class BraveStatsBottomSheetDialogFragment extends BottomSheetDialogFragme private TextView adsTrackersCountText; + private TextView adsTrackersText; private TextView dataSavedCountText; private TextView dataSavedText; private TextView timeSavedCountText; @@ -138,6 +139,7 @@ public class BraveStatsBottomSheetDialogFragment extends BottomSheetDialogFragme LinearLayout layout = view.findViewById(R.id.brave_stats_layout); adsTrackersCountText = layout.findViewById(R.id.ads_trackers_count_text); + adsTrackersText = layout.findViewById(R.id.ads_trackers_text); dataSavedCountText = layout.findViewById(R.id.data_saved_count_text); dataSavedText = layout.findViewById(R.id.data_saved_text); timeSavedCountText = layout.findViewById(R.id.time_saved_count_text); @@ -172,27 +174,6 @@ public class BraveStatsBottomSheetDialogFragment extends BottomSheetDialogFragme dialog.setContentView(view); } - private void setWidthForDialog() { - boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(getActivity()); - if (isTablet) { - getDialog().getWindow().setLayout(dpToPx(getActivity(), 400), -1); - } else { - getDialog().getWindow().setLayout(-1, -1); - } - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - setWidthForDialog(); - } - - @Override - public void onResume() { - super.onResume(); - setWidthForDialog(); - } - @Override public void onDestroyView() { getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); @@ -244,9 +225,22 @@ public class BraveStatsBottomSheetDialogFragment extends BottomSheetDialogFragme Pair dataSavedPair = BraveStatsUtil.getBraveStatsStringFormNumberPair(totalSavedBandwidth, true); dataSavedCountText.setText(dataSavedPair.first); - dataSavedText.setText( + boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(getActivity()); + if (isTablet) { + adsTrackersText.setText( + String.format(mContext.getResources().getString(R.string.trackers_and_ads), + dataSavedPair.second)); + dataSavedText.setText( + String.format(mContext.getResources().getString(R.string.data_saved_tablet_text), + dataSavedPair.second)); + } else { + adsTrackersText.setText( + String.format(mContext.getResources().getString(R.string.ads_trackers_text), + dataSavedPair.second)); + dataSavedText.setText( String.format(mContext.getResources().getString(R.string.data_saved_text), dataSavedPair.second)); + } long timeSavedCount = adsTrackersCount * BraveNewTabPageLayout.MILLISECONDS_PER_ITEM; diff --git a/android/java/res/drawable/brave_stats_radio_button_selected.xml b/android/java/res/drawable/brave_stats_radio_button_selected.xml index 131c99329a2..771e76f2ac4 100644 --- a/android/java/res/drawable/brave_stats_radio_button_selected.xml +++ b/android/java/res/drawable/brave_stats_radio_button_selected.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/android/java/res/layout/brave_stats_pager_layout.xml b/android/java/res/layout/brave_stats_pager_layout.xml index 9f11764baeb..a29f7f43dc9 100644 --- a/android/java/res/layout/brave_stats_pager_layout.xml +++ b/android/java/res/layout/brave_stats_pager_layout.xml @@ -48,9 +48,9 @@ android:textColor="@color/brave_stats_ads_color"/> #1E2029 #33F0F2FF #F0F2FF - #3B3E4F + #17171F + #3B3E4F diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index cdf7b1ba655..0965ef0dd86 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -109,4 +109,5 @@ #335DB5FC #5DB5FC #495057 + @android:color/white diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 5ee8058e41b..b0abc8504d8 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -1233,6 +1233,9 @@ until they verify, or until 90 days have passed. Data Saved\n(%1$s) + + Data Saved (%1$s) + Time Saved