Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Remove feature flag for proton icons re-design #18132

Browse Source
upstream-sync
Arturo Mejia 3 years ago
parent 791e3673ee
commit 52587753a5
11 changed files with 107 additions and 553 deletions
Show Stats Download Patch File Download Diff File

5
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
Unescape Escape View File

@ -43,9 +43,4 @@ object FeatureFlags {
* Enables the tabs tray re-write with Synced Tabs.
*/
const val tabsTrayRewrite = true
/**
* Enables the updated icon set look and feel.
*/
val newIconSet = Config.channel.isNightlyOrDebug
}

22
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
Unescape Escape View File

@ -34,13 +34,11 @@ import mozilla.components.concept.sync.AccountObserver
import mozilla.components.concept.sync.AuthType
import mozilla.components.concept.sync.OAuthAccount
import mozilla.components.concept.sync.Profile
import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.ktx.android.view.showKeyboard
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.Config
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.experiments.ExperimentBranch
import org.mozilla.fenix.experiments.Experiments
@ -153,17 +151,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
*/
private fun getPreferenceLayoutId() =
if (isDefaultBrowserExperimentBranch() && !isFirefoxDefaultBrowser()) {
if (FeatureFlags.newIconSet) {
R.xml.preferences_without_icons_default_browser_experiment
} else {
R.xml.preferences_default_browser_experiment
}
R.xml.preferences_default_browser_experiment
} else {
if (FeatureFlags.newIconSet) {
R.xml.preferences_without_icons
} else {
R.xml.preferences
}
R.xml.preferences
}
@SuppressLint("RestrictedApi")
@ -395,8 +385,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
private fun setupPreferences() {
val leakKey = getPreferenceKey(R.string.pref_key_leakcanary)
val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging)
val preferencePrivateBrowsing =
requirePreference<Preference>(R.string.pref_key_private_browsing)
val preferenceLeakCanary = findPreference<Preference>(leakKey)
val preferenceRemoteDebugging = findPreference<Preference>(debuggingKey)
val preferenceMakeDefaultBrowser =
@ -404,12 +392,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
val preferenceOpenLinksInExternalApp =
findPreference<Preference>(getPreferenceKey(R.string.pref_key_open_links_in_external_app))
if (!FeatureFlags.newIconSet) {
preferencePrivateBrowsing.icon.mutate().apply {
setTint(requireContext().getColorFromAttr(R.attr.primaryText))
}
}
if (!Config.channel.isReleased) {
preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue ->
val isEnabled = newValue == true

2
app/src/main/res/drawable/ic_edit.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?primaryText"
android:pathData="M3.9 20.1l3.8-1.6 0.2-0.2-2.2-2.2-0.2 0.2zM19 9L8.8 19.2a2 2 0 0 1-0.7 0.5L2.6 22a0.5 0.5 0 0 1-0.5-0.1 0.5 0.5 0 0 1-0.1-0.5l2.3-5.5 0.5-0.7L15 5a0.5 0.5 0 0 1 0.7 0l3.3 3.3a0.5 0.5 0 0 1 0 0.7zM17 3l0.5-0.5a2 2 0 0 1 2.8 0l1.2 1.2a2 2 0 0 1 0 2.8l-0.5 0.5a0.5 0.5 0 0 1-0.7 0l-3.3-3.3a0.5 0.5 0 0 1 0-0.7z"/>
android:pathData="M20.976 19.308l-0.752-4.055a2.602 2.602 0 0 0-0.719-1.369L8.356 2.735a2.522 2.522 0 0 0-3.559 0L2.735 4.797a2.522 2.522 0 0 0 0 3.559l11.151 11.15c0.375 0.374 0.849 0.622 1.366 0.717l4.056 0.752a1.43 1.43 0 0 0 1.668-1.667zM5.166 8.666L3.642 7.142V6.011l2.369-2.369h1.131l1.524 1.524-3.5 3.5zm10.357 10.082a1.098 1.098 0 0 1-0.577-0.303l-8.72-8.719 3.5-3.5 8.714 8.714c0.161 0.162 0.267 0.363 0.308 0.586l0.625 3.371-0.476 0.476-3.374-0.625z"/>
</vector>

5
app/src/main/res/drawable/ic_history.xml
Unescape Escape View File

@ -9,5 +9,8 @@
android:viewportHeight="24">
<path
android:fillColor="?primaryText"
android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm4.5 9h-5a0.5 0.5 0 0 1-0.5-0.5v-5a0.5 0.5 0 0 1 1 0V12h4.5a0.5 0.5 0 0 1 0 1z"/>
android:pathData="M11.974 21.5c-5.238 0-9.5-4.262-9.5-9.5s4.262-9.5 9.5-9.5 9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zm0-17.5c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
<path
android:fillColor="?primaryText"
android:pathData="M15.414 14.948a0.748 0.748 0 0 1-0.385-0.106l-3.664-2.198L11 12V7.75a0.75 0.75 0 0 1 1.5 0v3.825l3.3 1.979a0.75 0.75 0 0 1-0.386 1.394z" />
</vector>

2
app/src/main/res/drawable/ic_multiple_tabs.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M15.22 22H5.78A3.78 3.78 0 0 1 2 18.22V8.78C2 6.69 3.7 5 5.78 5h9.44C17.31 5 19 6.7 19 8.78v9.44c0 2-1.7 3.78-3.78 3.78zM5.86 7C4.83 7 4 7.83 4 8.86v9.28C4 19.17 4.83 20 5.86 20h9.28c1 0 1.86-0.83 1.86-1.86V8.86C17 8 16.17 7 15 7H6zM6 4c0-1.1 1-2 2-2h8a6 6 0 0 1 6 6v0L22 16a2 2 0 0 1-2 2L20 8V8a4 4 0 0 0-4-4H6z"
android:pathData="M5.5 3A2.5 2.5 0 0 0 3 5.5v8A2.5 2.5 0 0 0 5.5 16h13a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 18.5 3h-13zm14 10.7l-0.8 0.8H5.3l-0.8-0.8V5.3l0.8-0.8h13.4l0.8 0.8v8.4zM5.3 19.5l-0.8-0.8v-0.95a0.75 0.75 0 0 0-1.5 0v0.75A2.5 2.5 0 0 0 5.5 21h13a2.5 2.5 0 0 0 2.5-2.5v-0.75a0.75 0.75 0 0 0-1.5 0v0.95l-0.8 0.8H5.3z"
android:fillColor="?primaryText" />
</vector>

2
app/src/main/res/drawable/ic_static_shortcut_private_tab_foreground.xml
Unescape Escape View File

@ -9,7 +9,7 @@
<group android:translateX="44.18182"
android:translateY="44.18182">
<path
android:pathData="M70.53,69C64.293,69 59.979,61.5 54,61.5C48.021,61.5 43.335,69 37.47,69C29.775,69 24.093,61.713 24,49.227C23.943,41.472 26.259,39 36.246,39C46.233,39 49.161,43.089 54,43.089C58.839,43.089 61.767,39 71.754,39C81.741,39 84.054,41.472 84,49.227C83.907,61.713 78.225,69 70.53,69ZM41.13,48.543C35.061,48.807 32.559,52.425 32.559,53.316C32.559,54.207 36.6,56.724 40.53,56.724C44.46,56.724 49.101,55.281 49.101,53.997C48.265,50.389 44.808,48.021 41.142,48.543L41.13,48.543ZM66.846,48.543C63.179,48.021 59.722,50.391 58.887,54C58.887,55.284 63.522,56.727 67.458,56.727C71.394,56.727 75.417,54.207 75.417,53.316C75.417,52.425 72.927,48.807 66.858,48.543L66.846,48.543Z"
android:pathData="M98.6 38.1a24.6 24.6 0 0 0-35.9-3L57 40.5h-6L45.3 35a24.6 24.6 0 0 0-36 3c-1 4.4 0.7 20.6 1.6 23.2 2 10.3 10.4 18 20.5 18 5 0 9.6-2 13.2-5.2l2.2-1.9c4-3.5 10-3.5 14-0.1l3.4 2.7c3.5 2.8 7.7 4.5 12.4 4.5 10 0 18.5-7.7 20.4-18 1-2.6 2.8-18.7 1.6-23.2zM44.1 54.2c-2.4 2.6-6.2 4.3-10.4 4.3s-7.9-1.7-10.3-4.3a3.7 3.7 0 0 1 0-4.9c2.4-2.6 6.2-4.3 10.4-4.3s7.9 1.7 10.3 4.3a3.7 3.7 0 0 1 0 4.9zm40.5 0c-2.4 2.6-6.2 4.3-10.3 4.3s-8-1.7-10.4-4.3a3.7 3.7 0 0 1 0-4.9c2.4-2.6 6.2-4.3 10.4-4.3s7.9 1.7 10.3 4.3a3.7 3.7 0 0 1 0 4.9z"
android:strokeWidth="1"
android:fillColor="#312A65"
android:fillType="evenOdd"

2
app/src/main/res/drawable/ic_static_shortcut_tab_foreground.xml
Unescape Escape View File

@ -9,7 +9,7 @@
<group android:translateX="63.391304"
android:translateY="63.391304">
<path
android:pathData="M81,49.5L58.5,49.5L58.5,27C58.5,24.515 56.485,22.5 54,22.5C51.515,22.5 49.5,24.515 49.5,27L49.5,49.5L27,49.5C24.515,49.5 22.5,51.515 22.5,54C22.5,56.485 24.515,58.5 27,58.5L49.5,58.5L49.5,81C49.5,83.485 51.515,85.5 54,85.5C56.485,85.5 58.5,83.485 58.5,81L58.5,58.5L81,58.5C83.485,58.5 85.5,56.485 85.5,54C85.5,51.515 83.485,49.5 81,49.5Z"
android:pathData="M86.625 57.375c0.931 0 1.778-0.378 2.385-0.99A3.36 3.36 0 0 0 90 54a3.376 3.376 0 0 0-3.375-3.375h-25.65l-3.6-3.6v-25.65a3.376 3.376 0 0 0-6.75 0v25.65l-3.6 3.6h-25.65a3.376 3.376 0 0 0 0 6.75h25.65l3.6 3.6v25.65A3.376 3.376 0 0 0 54 90c0.931 0 1.778-0.378 2.385-0.99a3.36 3.36 0 0 0 0.99-2.385v-25.65l3.6-3.6h25.65z"
android:strokeWidth="1"
android:fillColor="#312A65"
android:fillType="evenOdd"

74
app/src/main/res/xml/preferences.xml
Unescape Escape View File

@ -14,16 +14,15 @@
app:allowDividerBelow="false" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_allow_domestic_china_fxa_server"
android:title="@string/preferences_allow_domestic_china_fxa_server"
android:defaultValue="true"/>
android:key="@string/pref_key_allow_domestic_china_fxa_server"
android:title="@string/preferences_allow_domestic_china_fxa_server"
android:defaultValue="true"/>
<androidx.preference.PreferenceCategory
android:key="@string/pref_key_account_category"
android:title="@string/preferences_category_account"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false"
android:layout="@layout/preference_cat_style">
android:layout="@layout/preference_category_no_icon_style">
<org.mozilla.fenix.settings.account.AccountPreference
android:icon="@drawable/ic_account"
@ -50,160 +49,157 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_general"
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:icon="@drawable/ic_search"
app:iconSpaceReserved="false"
android:key="@string/pref_key_search_settings"
android:title="@string/preferences_search" />
<androidx.preference.Preference
android:icon="@drawable/ic_multiple_tabs"
app:iconSpaceReserved="false"
android:key="@string/pref_key_tabs"
android:title="@string/preferences_tabs" />
<androidx.preference.Preference
android:icon="@drawable/ic_customize"
android:key="@string/pref_key_customize"
app:iconSpaceReserved="false"
android:title="@string/preferences_customize" />
<androidx.preference.Preference
android:icon="@drawable/ic_login"
android:key="@string/pref_key_passwords"
app:iconSpaceReserved="false"
android:title="@string/preferences_passwords_logins_and_passwords" />
<androidx.preference.Preference
android:icon="@drawable/ic_formfill"
app:iconSpaceReserved="false"
android:key="@string/pref_key_credit_cards"
android:title="@string/preferences_credit_cards"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_accessibility"
android:key="@string/pref_key_accessibility"
app:iconSpaceReserved="false"
android:title="@string/preferences_accessibility" />
<androidx.preference.Preference
android:icon="@drawable/ic_language"
android:key="@string/pref_key_language"
app:iconSpaceReserved="false"
android:title="@string/preferences_language" />
<org.mozilla.fenix.settings.DefaultBrowserPreference
android:icon="@drawable/ic_internet"
android:key="@string/pref_key_make_default_browser"
app:iconSpaceReserved="false"
android:title="@string/preferences_set_as_default_browser" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_privacy_security"
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:icon="@drawable/ic_private_browsing"
android:key="@string/pref_key_private_browsing"
app:iconSpaceReserved="false"
android:title="@string/preferences_private_browsing_options" />
<androidx.preference.Preference
android:icon="@drawable/ic_tracking_protection_enabled"
android:key="@string/pref_key_tracking_protection_settings"
app:iconSpaceReserved="false"
android:title="@string/preference_enhanced_tracking_protection" />
<androidx.preference.Preference
android:icon="@drawable/ic_permission"
android:key="@string/pref_key_site_permissions"
app:iconSpaceReserved="false"
android:title="@string/preferences_site_permissions" />
<androidx.preference.Preference
android:icon="@drawable/ic_delete"
android:key="@string/pref_key_delete_browsing_data"
app:iconSpaceReserved="false"
android:title="@string/preferences_delete_browsing_data" />
<androidx.preference.Preference
android:icon="@drawable/ic_exit"
android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
app:iconSpaceReserved="false"
android:title="@string/preferences_delete_browsing_data_on_quit" />
<androidx.preference.Preference
android:icon="@drawable/ic_notifications"
android:key="@string/pref_key_notifications"
app:iconSpaceReserved="false"
android:title="@string/preferences_notifications" />
<androidx.preference.Preference
android:icon="@drawable/ic_data_collection"
android:key="@string/pref_key_data_choices"
app:iconSpaceReserved="false"
android:title="@string/preferences_data_collection" />
</androidx.preference.PreferenceCategory>
<PreferenceCategory
android:title="@string/preferences_category_advanced"
app:iconSpaceReserved="false"
android:key="@string/pref_key_advanced"
android:layout="@layout/preference_cat_style">
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:icon="@drawable/ic_addons_extensions"
android:key="@string/pref_key_addons"
app:iconSpaceReserved="false"
android:title="@string/preferences_addons" />
<androidx.preference.Preference
android:icon="@drawable/ic_addons_extensions"
android:key="@string/pref_key_override_amo_collection"
app:iconSpaceReserved="false"
android:title="@string/preferences_customize_amo_collection" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_open_in_app"
android:key="@string/pref_key_open_links_in_external_app"
app:iconSpaceReserved="false"
android:title="@string/preferences_open_links_in_apps" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_download"
android:key="@string/pref_key_external_download_manager"
app:iconSpaceReserved="false"
android:title="@string/preferences_external_download_manager" />
<androidx.preference.SwitchPreference
android:defaultValue="true"
android:icon="@drawable/ic_info"
android:key="@string/pref_key_leakcanary"
android:title="@string/preference_leakcanary"
app:iconSpaceReserved="false"
app:isPreferenceVisible="@bool/IS_DEBUG" />
<androidx.preference.SwitchPreference
android:icon="@drawable/ic_energy"
android:key="@string/pref_key_remote_debugging"
android:title="@string/preferences_remote_debugging"
app:iconSpaceReserved="false"
android:defaultValue="false" />
</PreferenceCategory>
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:icon="@drawable/ic_bookmark_outline"
android:key="@string/pref_key_rate"
app:iconSpaceReserved="false"
android:title="@string/preferences_rate" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_about"
app:iconSpaceReserved="false"
android:title="@string/preferences_about" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_debug_settings"
app:iconSpaceReserved="false"
android:title="@string/preferences_debug_settings"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_secret_debug_info"
app:iconSpaceReserved="false"
android:title="@string/preferences_debug_info"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_nimbus_experiments"
app:iconSpaceReserved="false"
android:title="@string/preferences_nimbus_experiments"
app:isPreferenceVisible="false" />
</androidx.preference.PreferenceCategory>

129
app/src/main/res/xml/preferences_default_browser_experiment.xml
Unescape Escape View File

@ -1,8 +1,10 @@
<?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.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.preference.Preference
@ -30,185 +32,178 @@
app:isPreferenceVisible="false" />
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_category_general"
app:iconSpaceReserved="false">
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_general">
<androidx.preference.Preference
android:icon="@drawable/ic_search"
android:key="@string/pref_key_search_settings"
android:title="@string/preferences_search" />
android:title="@string/preferences_search"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_multiple_tabs"
android:key="@string/pref_key_tabs"
android:title="@string/preferences_tabs" />
android:title="@string/preferences_tabs"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_customize"
android:key="@string/pref_key_customize"
android:title="@string/preferences_customize" />
android:title="@string/preferences_customize"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_login"
android:key="@string/pref_key_passwords"
android:title="@string/preferences_passwords_logins_and_passwords" />
android:title="@string/preferences_passwords_logins_and_passwords"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_formfill"
android:key="@string/pref_key_credit_cards"
android:title="@string/preferences_credit_cards"
app:isPreferenceVisible="false" />
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_accessibility"
android:key="@string/pref_key_accessibility"
android:title="@string/preferences_accessibility" />
android:title="@string/preferences_accessibility"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_language"
android:key="@string/pref_key_language"
android:title="@string/preferences_language" />
android:title="@string/preferences_language"
app:iconSpaceReserved="false" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_key_sign_in"
android:layout="@layout/preference_cat_style"
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_account">
<androidx.preference.Preference
android:icon="@drawable/ic_account"
android:key="@string/pref_key_sign_in"
android:title="@string/preferences_sync"
app:allowDividerBelow="true"
app:iconSpaceReserved="false" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_key_account_category"
android:layout="@layout/preference_cat_style"
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_account"
app:isPreferenceVisible="false">
<org.mozilla.fenix.settings.account.AccountPreference
android:icon="@drawable/ic_account"
android:key="@string/pref_key_account" />
android:key="@string/pref_key_account"
app:iconSpaceReserved="false"/>
<org.mozilla.fenix.settings.account.AccountAuthErrorPreference
android:icon="@drawable/ic_account_warning"
android:key="@string/pref_key_account_auth_error" />
android:key="@string/pref_key_account_auth_error"
app:iconSpaceReserved="false"/>
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_category_privacy_security"
app:iconSpaceReserved="false">
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_privacy_security">
<androidx.preference.Preference
android:icon="@drawable/ic_private_browsing"
android:key="@string/pref_key_private_browsing"
android:title="@string/preferences_private_browsing_options" />
android:title="@string/preferences_private_browsing_options"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_tracking_protection_enabled"
android:key="@string/pref_key_tracking_protection_settings"
android:title="@string/preference_enhanced_tracking_protection" />
android:title="@string/preference_enhanced_tracking_protection"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_permission"
android:key="@string/pref_key_site_permissions"
android:title="@string/preferences_site_permissions" />
android:title="@string/preferences_site_permissions"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_delete"
android:key="@string/pref_key_delete_browsing_data"
android:title="@string/preferences_delete_browsing_data" />
android:title="@string/preferences_delete_browsing_data"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_exit"
android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
android:title="@string/preferences_delete_browsing_data_on_quit" />
android:title="@string/preferences_delete_browsing_data_on_quit"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_notifications"
android:key="@string/pref_key_notifications"
android:title="@string/preferences_notifications" />
android:title="@string/preferences_notifications"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_data_collection"
android:key="@string/pref_key_data_choices"
android:title="@string/preferences_data_collection" />
android:title="@string/preferences_data_collection"
app:iconSpaceReserved="false" />
</androidx.preference.PreferenceCategory>
<PreferenceCategory
android:key="@string/pref_key_advanced"
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_category_advanced"
app:iconSpaceReserved="false">
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_advanced">
<androidx.preference.Preference
android:icon="@drawable/ic_addons_extensions"
android:key="@string/pref_key_addons"
android:title="@string/preferences_addons" />
android:title="@string/preferences_addons"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_addons_extensions"
android:key="@string/pref_key_override_amo_collection"
android:title="@string/preferences_customize_amo_collection" />
android:title="@string/preferences_customize_amo_collection"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_open_in_app"
android:key="@string/pref_key_open_links_in_external_app"
android:title="@string/preferences_open_links_in_apps" />
android:title="@string/preferences_open_links_in_apps"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_download"
android:key="@string/pref_key_external_download_manager"
android:title="@string/preferences_external_download_manager" />
android:title="@string/preferences_external_download_manager"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:defaultValue="true"
android:icon="@drawable/ic_info"
android:key="@string/pref_key_leakcanary"
android:title="@string/preference_leakcanary"
app:iconSpaceReserved="false"
app:isPreferenceVisible="@bool/IS_DEBUG" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_energy"
android:key="@string/pref_key_remote_debugging"
android:title="@string/preferences_remote_debugging" />
android:title="@string/preferences_remote_debugging"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false">
<androidx.preference.Preference
android:icon="@drawable/ic_bookmark_outline"
android:key="@string/pref_key_rate"
android:title="@string/preferences_rate" />
android:title="@string/preferences_rate"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_about"
android:title="@string/preferences_about" />
android:title="@string/preferences_about"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_debug_settings"
android:title="@string/preferences_debug_settings"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_secret_debug_info"
android:title="@string/preferences_debug_info"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:icon="@drawable/ic_info"
android:key="@string/pref_key_nimbus_experiments"
android:title="@string/preferences_nimbus_experiments"
app:isPreferenceVisible="false" />

206
app/src/main/res/xml/preferences_without_icons.xml
Unescape Escape View File

@ -1,206 +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.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.preference.Preference
android:key="@string/pref_key_sign_in"
android:layout="@layout/sign_in_preference"
android:summary="@string/preferences_sign_in_description"
android:title="@string/preferences_sync"
app:allowDividerBelow="false" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_allow_domestic_china_fxa_server"
android:title="@string/preferences_allow_domestic_china_fxa_server"
android:defaultValue="true" />
<androidx.preference.PreferenceCategory
android:key="@string/pref_key_account_category"
android:title="@string/preferences_category_account"
app:isPreferenceVisible="false"
android:layout="@layout/preference_category_no_icon_style">
<org.mozilla.fenix.settings.account.AccountPreference
android:icon="@drawable/ic_account"
android:key="@string/pref_key_account" />
<org.mozilla.fenix.settings.account.AccountAuthErrorPreference
android:icon="@drawable/ic_account_warning"
android:key="@string/pref_key_account_auth_error" />
</androidx.preference.PreferenceCategory>
<androidx.preference.EditTextPreference
android:key="@string/pref_key_override_fxa_server"
android:title="@string/preferences_override_fxa_server"
android:inputType="textUri"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.EditTextPreference
android:key="@string/pref_key_override_sync_tokenserver"
android:title="@string/preferences_override_sync_tokenserver"
android:inputType="textUri"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_general"
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
app:iconSpaceReserved="false"
android:key="@string/pref_key_search_settings"
android:title="@string/preferences_search" />
<androidx.preference.Preference
app:iconSpaceReserved="false"
android:key="@string/pref_key_tabs"
android:title="@string/preferences_tabs" />
<androidx.preference.Preference
android:key="@string/pref_key_customize"
app:iconSpaceReserved="false"
android:title="@string/preferences_customize" />
<androidx.preference.Preference
android:key="@string/pref_key_passwords"
app:iconSpaceReserved="false"
android:title="@string/preferences_passwords_logins_and_passwords" />
<androidx.preference.Preference
app:iconSpaceReserved="false"
android:key="@string/pref_key_credit_cards"
android:title="@string/preferences_credit_cards"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:key="@string/pref_key_accessibility"
app:iconSpaceReserved="false"
android:title="@string/preferences_accessibility" />
<androidx.preference.Preference
android:key="@string/pref_key_language"
app:iconSpaceReserved="false"
android:title="@string/preferences_language" />
<org.mozilla.fenix.settings.DefaultBrowserPreference
android:key="@string/pref_key_make_default_browser"
app:iconSpaceReserved="false"
android:title="@string/preferences_set_as_default_browser" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_privacy_security"
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:key="@string/pref_key_private_browsing"
app:iconSpaceReserved="false"
android:title="@string/preferences_private_browsing_options" />
<androidx.preference.Preference
android:key="@string/pref_key_tracking_protection_settings"
app:iconSpaceReserved="false"
android:title="@string/preference_enhanced_tracking_protection" />
<androidx.preference.Preference
android:key="@string/pref_key_site_permissions"
app:iconSpaceReserved="false"
android:title="@string/preferences_site_permissions" />
<androidx.preference.Preference
android:key="@string/pref_key_delete_browsing_data"
app:iconSpaceReserved="false"
android:title="@string/preferences_delete_browsing_data" />
<androidx.preference.Preference
android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
app:iconSpaceReserved="false"
android:title="@string/preferences_delete_browsing_data_on_quit" />
<androidx.preference.Preference
android:key="@string/pref_key_notifications"
app:iconSpaceReserved="false"
android:title="@string/preferences_notifications" />
<androidx.preference.Preference
android:key="@string/pref_key_data_choices"
app:iconSpaceReserved="false"
android:title="@string/preferences_data_collection" />
</androidx.preference.PreferenceCategory>
<PreferenceCategory
android:title="@string/preferences_category_advanced"
android:key="@string/pref_key_advanced"
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:key="@string/pref_key_addons"
app:iconSpaceReserved="false"
android:title="@string/preferences_addons" />
<androidx.preference.Preference
android:key="@string/pref_key_override_amo_collection"
app:iconSpaceReserved="false"
android:title="@string/preferences_customize_amo_collection" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_open_links_in_external_app"
app:iconSpaceReserved="false"
android:title="@string/preferences_open_links_in_apps" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_external_download_manager"
app:iconSpaceReserved="false"
android:title="@string/preferences_external_download_manager" />
<androidx.preference.SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_leakcanary"
android:title="@string/preference_leakcanary"
app:iconSpaceReserved="false"
app:isPreferenceVisible="@bool/IS_DEBUG" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_remote_debugging"
android:title="@string/preferences_remote_debugging"
app:iconSpaceReserved="false"
android:defaultValue="false" />
</PreferenceCategory>
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false"
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
android:key="@string/pref_key_rate"
app:iconSpaceReserved="false"
android:title="@string/preferences_rate" />
<androidx.preference.Preference
android:key="@string/pref_key_about"
app:iconSpaceReserved="false"
android:title="@string/preferences_about" />
<androidx.preference.Preference
android:key="@string/pref_key_debug_settings"
app:iconSpaceReserved="false"
android:title="@string/preferences_debug_settings"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:key="@string/pref_key_secret_debug_info"
app:iconSpaceReserved="false"
android:title="@string/preferences_debug_info"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:key="@string/pref_key_nimbus_experiments"
app:iconSpaceReserved="false"
android:title="@string/preferences_nimbus_experiments"
app:isPreferenceVisible="false" />
</androidx.preference.PreferenceCategory>
</androidx.preference.PreferenceScreen>

211
app/src/main/res/xml/preferences_without_icons_default_browser_experiment.xml
Unescape Escape View File

@ -1,211 +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.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.preference.Preference
android:key="@string/pref_key_make_default_browser"
android:layout="@layout/default_browser_experiment_preference"
app:allowDividerBelow="false" />
<androidx.preference.SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_allow_domestic_china_fxa_server"
android:title="@string/preferences_allow_domestic_china_fxa_server" />
<androidx.preference.EditTextPreference
android:inputType="textUri"
android:key="@string/pref_key_override_fxa_server"
android:title="@string/preferences_override_fxa_server"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.EditTextPreference
android:inputType="textUri"
android:key="@string/pref_key_override_sync_tokenserver"
android:title="@string/preferences_override_sync_tokenserver"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_general">
<androidx.preference.Preference
android:key="@string/pref_key_search_settings"
android:title="@string/preferences_search"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_tabs"
android:title="@string/preferences_tabs"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_customize"
android:title="@string/preferences_customize"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_passwords"
android:title="@string/preferences_passwords_logins_and_passwords"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_credit_cards"
android:title="@string/preferences_credit_cards"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_accessibility"
android:title="@string/preferences_accessibility"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_language"
android:title="@string/preferences_language"
app:iconSpaceReserved="false" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_key_sign_in"
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_account">
<androidx.preference.Preference
android:key="@string/pref_key_sign_in"
android:title="@string/preferences_sync"
app:allowDividerBelow="true"
app:iconSpaceReserved="false" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_key_account_category"
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_account"
app:isPreferenceVisible="false">
<org.mozilla.fenix.settings.account.AccountPreference
android:key="@string/pref_key_account"
app:iconSpaceReserved="false"/>
<org.mozilla.fenix.settings.account.AccountAuthErrorPreference
android:key="@string/pref_key_account_auth_error"
app:iconSpaceReserved="false"/>
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_privacy_security">
<androidx.preference.Preference
android:key="@string/pref_key_private_browsing"
android:title="@string/preferences_private_browsing_options"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_tracking_protection_settings"
android:title="@string/preference_enhanced_tracking_protection"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_site_permissions"
android:title="@string/preferences_site_permissions"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_delete_browsing_data"
android:title="@string/preferences_delete_browsing_data"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
android:title="@string/preferences_delete_browsing_data_on_quit"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_notifications"
android:title="@string/preferences_notifications"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_data_choices"
android:title="@string/preferences_data_collection"
app:iconSpaceReserved="false" />
</androidx.preference.PreferenceCategory>
<PreferenceCategory
android:key="@string/pref_key_advanced"
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_advanced">
<androidx.preference.Preference
android:key="@string/pref_key_addons"
android:title="@string/preferences_addons"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_override_amo_collection"
android:title="@string/preferences_customize_amo_collection"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_open_links_in_external_app"
android:title="@string/preferences_open_links_in_apps"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_external_download_manager"
android:title="@string/preferences_external_download_manager"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_leakcanary"
android:title="@string/preference_leakcanary"
app:iconSpaceReserved="false"
app:isPreferenceVisible="@bool/IS_DEBUG" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_remote_debugging"
android:title="@string/preferences_remote_debugging"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_category_no_icon_style"
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false">
<androidx.preference.Preference
android:key="@string/pref_key_rate"
android:title="@string/preferences_rate"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_about"
android:title="@string/preferences_about"
app:iconSpaceReserved="false" />
<androidx.preference.Preference
android:key="@string/pref_key_debug_settings"
android:title="@string/preferences_debug_settings"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:key="@string/pref_key_secret_debug_info"
android:title="@string/preferences_debug_info"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false" />
<androidx.preference.Preference
android:key="@string/pref_key_nimbus_experiments"
android:title="@string/preferences_nimbus_experiments"
app:isPreferenceVisible="false" />
</androidx.preference.PreferenceCategory>
</androidx.preference.PreferenceScreen>
Write Preview
Loading…
Cancel
Save