mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-15 18:12:54 +00:00
[fenix] For https://github.com/mozilla-mobile/fenix/issues/11665: Adjust visual design for delete browsing data screens.
This commit is contained in:
mcarare
Mihai Branescu
parent
10693b9b91
commit
18d51f00d7
@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
<?xml version="1.0" encoding="utf-8"?><!-- 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/. -->
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
@ -7,12 +6,12 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="?android:selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="16dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:paddingEnd="16dp">
|
||||
|
||||
<LinearLayout
|
||||
@ -29,6 +28,7 @@
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:textColor="@color/state_list_text_color"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintBottom_toTopOf="@android:id/summary"
|
||||
@ -42,6 +42,7 @@
|
||||
android:id="@android:id/summary"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:textColor="@color/secondary_state_list_text_color"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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/. -->
|
||||
<androidx.constraintlayout.widget.ConstraintLayout 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:background="?android:selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="?android:attr/scrollbarSize">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@android:id/widget_frame"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="0dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/state_list_text_color"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintBottom_toTopOf="@android:id/summary"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@android:id/widget_frame"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
tools:text="Delete browsing data category" />
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/summary"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/secondary_state_list_text_color"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@android:id/widget_frame"
|
||||
app:layout_constraintTop_toBottomOf="@android:id/title"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
tools:text="Delete browsing data summary" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -27,6 +27,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
|
||||
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="8dp"
|
||||
android:clickable="false"
|
||||
android:textAppearance="@style/ListItemTextStyle"
|
||||
app:layout_constraintBottom_toTopOf="@id/subtitle"
|
||||
@ -42,8 +44,10 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
|
||||
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="8dp"
|
||||
android:clickable="false"
|
||||
android:textAppearance="@style/SubtitleTextStyle"
|
||||
android:textColor="@color/secondary_state_list_text_color"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/checkbox"
|
||||
|
||||
4
app/src/main/res/layout/preference_category_empty.xml
Normal file
4
app/src/main/res/layout/preference_category_empty.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp" />
|
||||
@ -871,8 +871,6 @@
|
||||
<string name="preference_summary_delete_browsing_data_on_quit">Automatically deletes browsing data when you select "Quit" from the main menu</string>
|
||||
<!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
|
||||
<string name="preference_summary_delete_browsing_data_on_quit_2">Automatically deletes browsing data when you select \"Quit\" from the main menu</string>
|
||||
<!-- Category for history items to delete on quit in delete browsing data on quit -->
|
||||
<string name="preferences_delete_browsing_data_on_quit_browsing_history">Browsing history</string>
|
||||
<!-- Action item in menu for the Delete browsing data on quit feature -->
|
||||
<string name="delete_browsing_data_on_quit_action">Quit</string>
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<SwitchPreference
|
||||
app:iconSpaceReserved="false"
|
||||
android:defaultValue="false"
|
||||
android:key="@string/pref_key_delete_browsing_data_on_quit"
|
||||
android:summary="@string/preference_summary_delete_browsing_data_on_quit_2"
|
||||
@ -15,28 +14,28 @@
|
||||
android:key="@string/pref_key_delete_browsing_data_on_quit_categories"
|
||||
app:allowDividerAbove="false"
|
||||
app:iconSpaceReserved="false"
|
||||
android:layout="@layout/preference_cat_style">
|
||||
android:layout="@layout/preference_category_empty">
|
||||
<CheckBoxPreference
|
||||
android:key="@string/pref_key_delete_open_tabs_on_quit"
|
||||
android:layout="@layout/delete_browsing_category_checkbox"
|
||||
android:layout="@layout/checkbox_left_preference"
|
||||
android:title="@string/preferences_delete_browsing_data_tabs_title_2" />
|
||||
<CheckBoxPreference
|
||||
android:key="@string/pref_key_delete_browsing_history_on_quit"
|
||||
android:layout="@layout/delete_browsing_category_checkbox"
|
||||
android:title="@string/preferences_delete_browsing_data_on_quit_browsing_history" />
|
||||
android:layout="@layout/checkbox_left_preference"
|
||||
android:title="@string/preferences_delete_browsing_data_browsing_data_title" />
|
||||
<CheckBoxPreference
|
||||
android:key="@string/pref_key_delete_cookies_on_quit"
|
||||
android:layout="@layout/delete_browsing_category_checkbox"
|
||||
android:layout="@layout/checkbox_left_preference"
|
||||
android:summary="@string/preferences_delete_browsing_data_cookies_subtitle"
|
||||
android:title="@string/preferences_delete_browsing_data_cookies" />
|
||||
<CheckBoxPreference
|
||||
android:key="@string/pref_key_delete_caches_on_quit"
|
||||
android:layout="@layout/delete_browsing_category_checkbox"
|
||||
android:layout="@layout/checkbox_left_preference"
|
||||
android:summary="@string/preferences_delete_browsing_data_cached_files_subtitle"
|
||||
android:title="@string/preferences_delete_browsing_data_cached_files" />
|
||||
<CheckBoxPreference
|
||||
android:key="@string/pref_key_delete_permissions_on_quit"
|
||||
android:layout="@layout/delete_browsing_category_checkbox"
|
||||
android:layout="@layout/checkbox_left_preference"
|
||||
android:title="@string/preferences_delete_browsing_data_site_permissions" />
|
||||
</PreferenceCategory>
|
||||
</androidx.preference.PreferenceScreen>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user