Matthew Finkel pushed to branch tor-browser-86.0.0b1-10.5-1 at The Tor Project / Applications / fenix
Commits:
-
26e874f9
by Matthew Finkel at 2021-02-03T00:06:15+00:00
-
1acf180b
by Matthew Finkel at 2021-02-03T00:06:16+00:00
7 changed files:
- app/src/main/AndroidManifest.xml
- app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt
- app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
- app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
- app/src/main/res/layout/quicksettings_permissions.xml
- app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
- app/src/main/res/xml/site_permissions_preferences.xml
Changes:
... | ... | @@ -4,11 +4,8 @@ |
4 | 4 |
package="org.mozilla.fenix">
|
5 | 5 |
|
6 | 6 |
<uses-permission android:name="android.permission.INTERNET" />
|
7 |
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
8 | 7 |
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
9 | 8 |
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
10 |
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
|
11 |
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
12 | 9 |
<uses-permission android:name="android.permission.CAMERA" />
|
13 | 10 |
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
14 | 11 |
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
|
... | ... | @@ -50,7 +50,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable |
50 | 50 |
AUTOPLAY_AUDIBLE ->
|
51 | 51 |
when (settings?.getAutoplayUserSetting(default = AUTOPLAY_BLOCK_ALL) ?: AUTOPLAY_BLOCK_ALL) {
|
52 | 52 |
AUTOPLAY_ALLOW_ALL -> R.string.preference_option_autoplay_allowed2
|
53 |
- AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2
|
|
53 |
+ // AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2
|
|
54 | 54 |
AUTOPLAY_BLOCK_AUDIBLE -> R.string.preference_option_autoplay_block_audio2
|
55 | 55 |
AUTOPLAY_BLOCK_ALL -> R.string.preference_option_autoplay_blocked3
|
56 | 56 |
else -> R.string.preference_option_autoplay_blocked3
|
... | ... | @@ -119,6 +119,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable |
119 | 119 |
return when (this) {
|
120 | 120 |
AUTOPLAY_AUDIBLE -> SitePermissionsRules.Action.BLOCKED
|
121 | 121 |
AUTOPLAY_INAUDIBLE -> SitePermissionsRules.Action.ALLOWED
|
122 |
+ LOCATION -> SitePermissionsRules.Action.BLOCKED
|
|
122 | 123 |
else -> SitePermissionsRules.Action.ASK_TO_ALLOW
|
123 | 124 |
}
|
124 | 125 |
}
|
... | ... | @@ -52,6 +52,7 @@ class SitePermissionsFragment : PreferenceFragmentCompat() { |
52 | 52 |
// Autoplay inaudible should be set in the same menu as autoplay audible, so it does
|
53 | 53 |
// not need to be bound
|
54 | 54 |
.filter { it != PhoneFeature.AUTOPLAY_INAUDIBLE }
|
55 |
+ .filter { it != PhoneFeature.LOCATION }
|
|
55 | 56 |
.forEach(::initPhoneFeature)
|
56 | 57 |
}
|
57 | 58 |
|
... | ... | @@ -115,6 +115,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() { |
115 | 115 |
saveActionInSettings(AUTOPLAY_ALLOW_ALL)
|
116 | 116 |
}
|
117 | 117 |
restoreState(AUTOPLAY_ALLOW_ON_WIFI)
|
118 |
+ visibility = View.GONE
|
|
118 | 119 |
} else {
|
119 | 120 |
text = getString(R.string.preference_option_phone_feature_blocked)
|
120 | 121 |
setOnClickListener {
|
... | ... | @@ -148,7 +148,7 @@ |
148 | 148 |
app:layout_constraintBottom_toTopOf="@id/autoplayLabel"
|
149 | 149 |
app:layout_constraintEnd_toStartOf="@id/mediaKeySystemAccessStatus"
|
150 | 150 |
app:layout_constraintStart_toStartOf="parent"
|
151 |
- tools:visibility="visible" />
|
|
151 |
+ tools:visibility="gone" />
|
|
152 | 152 |
|
153 | 153 |
<TextView
|
154 | 154 |
android:id="@+id/mediaKeySystemAccessStatus"
|
... | ... | @@ -160,7 +160,7 @@ |
160 | 160 |
app:layout_constraintEnd_toEndOf="parent"
|
161 | 161 |
app:layout_constraintStart_toEndOf="@id/mediaKeySystemAccessLabel"
|
162 | 162 |
tools:text="@string/preference_option_phone_feature_blocked"
|
163 |
- tools:visibility="visible" />
|
|
163 |
+ tools:visibility="gone" />
|
|
164 | 164 |
|
165 | 165 |
|
166 | 166 |
<TextView
|
... | ... | @@ -3,7 +3,8 @@ |
3 | 3 |
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
4 | 4 |
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
5 | 5 |
<androidx.preference.PreferenceScreen
|
6 |
- xmlns:android="http://schemas.android.com/apk/res/android">
|
|
6 |
+ xmlns:android="http://schemas.android.com/apk/res/android"
|
|
7 |
+ xmlns:app="http://schemas.android.com/apk/res-auto" >
|
|
7 | 8 |
<androidx.preference.Preference
|
8 | 9 |
android:icon="@drawable/ic_camera_enabled"
|
9 | 10 |
android:key="@string/pref_key_phone_feature_camera"
|
... | ... | @@ -38,6 +39,7 @@ |
38 | 39 |
android:icon="@drawable/ic_link"
|
39 | 40 |
android:key="@string/pref_key_browser_feature_media_key_system_access"
|
40 | 41 |
android:title="@string/preference_phone_feature_media_key_system_access"
|
42 |
+ app:isPreferenceVisible="false"
|
|
41 | 43 |
android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
|
42 | 44 |
|
43 | 45 |
<androidx.preference.Preference
|
... | ... | @@ -48,6 +48,7 @@ |
48 | 48 |
android:key="@string/pref_key_browser_feature_media_key_system_access"
|
49 | 49 |
android:title="@string/preference_phone_feature_media_key_system_access"
|
50 | 50 |
android:summary="@string/preference_option_phone_feature_ask_to_allow"
|
51 |
+ app:isPreferenceVisible="false"
|
|
51 | 52 |
app:allowDividerBelow="true"/>
|
52 | 53 |
|
53 | 54 |
<androidx.preference.Preference
|