diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-04-21 06:25:55 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-04-21 06:25:55 +0000 |
| commit | ef669659db8c9fbab2a84dcbc8f3e99411eb1201 (patch) | |
| tree | 4785f6b44d121f95c840020441687bce5777a44f /app/src/main/res | |
| parent | 2df577ca97a674a4bd3875dc5137bb44df2c03ef (diff) | |
| parent | 6068cebe972e000872e4780dd9f75680a3abf073 (diff) | |
Merge branch '6556-use_pname_for_trackers_2' into 'main'
6556: add AdvancedPrivacy App Id in trackers stats to avoid appUid aliasing
See merge request e/os/advanced-privacy!122
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/apptrackers_fragment.xml | 22 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index e6e226f..d0a72d5 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2023 MURENA SAS ~ Copyright (C) 2021 E FOUNDATION ~ ~ This program is free software: you can redistribute it and/or modify @@ -82,20 +83,33 @@ /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/trackers" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_marginBottom="32dp" + android:layout_marginBottom="16dp" tools:listitem="@layout/apptrackers_item_tracker_toggle" android:visibility="gone" /> <TextView android:id="@+id/no_trackers_yet" - android:padding="32dp" + android:paddingHorizontal="32dp" + android:paddingTop="64dp" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center" tools:text="@string/apptrackers_no_trackers_yet_block_off" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/btn_reset" + style="@style/Widget.MaterialComponents.Button.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/apptrackers_reset" + android:textSize="14sp" + android:layout_gravity="center" + android:visibility="gone" + tools:visibility="visible" + android:layout_margin="16dp" + /> </LinearLayout> </androidx.core.widget.NestedScrollView> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 38cd38b..49d9182 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,10 +92,12 @@ <string name="apptrackers_trackers_list_title">Opt for the trackers you want to activate/deactivate.</string> <string name="apptrackers_no_trackers_yet_block_off">No trackers were detected yet. If new trackers are detected they will be updated here.</string> <string name="apptrackers_no_trackers_yet_block_on">No trackers were detected yet. All future trackers will be blocked.</string> + <string name="app_trackers_no_trackers_yet_remaining_whitelist">No trackers were detected yet. Some trackers were unblocked previously.</string> <string name="apptrackers_error_quickprivacy_disabled">Enable Quick Privacy to be able to activate/deactivate trackers.</string> <string name="apptrackers_trackers_count_summary">%1$d blocked trackers out of %2$d detected trackers, %3$d blocked leaks and %4$d allowed leaks.</string> <string name="apptrackers_error_no_app">App not installed.</string> <string name="apptrackers_tracker_control_disabled_message">Changes will take effect when tracker blocker is on.</string> + <string name="apptrackers_reset">Reset trackers</string> <!-- Features warning dialog --> <string name="warningdialog_do_not_show_again">Do not show again</string> |