Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
9611b048
Commit
9611b048
authored
Sep 02, 2020
by
Matthew Finkel
Browse files
Bug 40016: Move Allow Screenshots under Advanced
parent
cb53717e
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View file @
9611b048
...
...
@@ -329,6 +329,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
val
preferenceMakeDefaultBrowser
=
requirePreference
<
Preference
>(
R
.
string
.
pref_key_make_default_browser
)
requirePreference
<
Preference
>(
R
.
string
.
pref_key_allow_screenshots_in_private_mode
).
apply
{
onPreferenceChangeListener
=
SharedPreferenceUpdater
()
}
if
(!
Config
.
channel
.
isReleased
)
{
preferenceLeakCanary
?.
setOnPreferenceChangeListener
{
_
,
newValue
->
val
isEnabled
=
newValue
==
true
...
...
app/src/main/res/drawable/ic_screenshot.xml
0 → 100644
View file @
9611b048
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"18dp"
android:height=
"18dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
>
<path
android:pathData=
"M3,4V1h2v3h3v2H5v3H3V6H0V4H3zM6,10V7h3V4h7l1.83,2H21c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H5c-1.1,0 -2,-0.9 -2,-2V10H6zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5s-5,2.24 -5,5S10.24,19 13,19zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2s-1.43,-3.2 -3.2,-3.2S9.8,12.23 9.8,14z"
android:fillColor=
"#ffffff"
/>
</vector>
app/src/main/res/values/torbrowser_strings.xml
View file @
9611b048
...
...
@@ -6,4 +6,6 @@
<string
name=
"preferences_disable_normal_mode"
>
Allow Only Private Browsing Mode
</string>
<!-- Preference link to donate to The Tor Project-->
<string
name=
"preferences_donate"
>
Donate to The Tor Project
</string>
<!-- Preference for allowing screenshots to be taken in the app-->
<string
name=
"preferences_allow_screenshots"
>
Allow screenshots
</string>
</resources>
app/src/main/res/xml/preferences.xml
View file @
9611b048
...
...
@@ -135,6 +135,11 @@
app:iconSpaceReserved=
"false"
android:key=
"@string/pref_key_advanced"
android:layout=
"@layout/preference_category_main_style"
>
<SwitchPreference
android:icon=
"@drawable/ic_screenshot"
android:key=
"@string/pref_key_allow_screenshots_in_private_mode"
android:title=
"@string/preferences_allow_screenshots"
/>
<androidx.preference.Preference
android:icon=
"@drawable/ic_addons_extensions"
android:key=
"@string/pref_key_addons"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment