PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the problem that some items can't be searched in Privacy category."

Browse Source
This commit is contained in:
Stanley Wang
2022-01-05 01:52:31 +00:00
committed by Android (Google) Code Review
parent d1f76eea72 a0146d3fb7
commit c35cab1c7b
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/privacy_dashboard_settings.xml
View File

@@ -49,7 +49,6 @@
android:key="privacy_permissions_usage" android:key="privacy_permissions_usage"
android:title="@string/permissions_usage_title" android:title="@string/permissions_usage_title"
android:summary="@string/permissions_usage_summary" android:summary="@string/permissions_usage_summary"
settings:searchable="false"
settings:controller="com.android.settings.privacy.PrivacyHubPreferenceController"> settings:controller="com.android.settings.privacy.PrivacyHubPreferenceController">
<intent android:action="android.intent.action.REVIEW_PERMISSION_USAGE"/> <intent android:action="android.intent.action.REVIEW_PERMISSION_USAGE"/>
</Preference> </Preference>
@@ -58,8 +57,7 @@
<Preference <Preference
android:key="privacy_manage_perms" android:key="privacy_manage_perms"
android:title="@string/app_permissions" android:title="@string/app_permissions"
android:summary="@string/runtime_permissions_summary_control_app_access" android:summary="@string/runtime_permissions_summary_control_app_access">
settings:searchable="false">
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/> <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
</Preference> </Preference>

2
src/com/android/settings/privacy/CameraToggleController.java
View File

@@ -40,7 +40,7 @@ public class CameraToggleController extends SensorToggleController {
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mSensorPrivacyManagerHelper.supportsSensorToggle(getSensor()) return mSensorPrivacyManagerHelper.supportsSensorToggle(getSensor())
&& DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, "camera_toggle_enabled", && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, "camera_toggle_enabled",
true) ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; true) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

2
src/com/android/settings/privacy/MicToggleController.java
View File

@@ -40,7 +40,7 @@ public class MicToggleController extends SensorToggleController {
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mSensorPrivacyManagerHelper.supportsSensorToggle(getSensor()) return mSensorPrivacyManagerHelper.supportsSensorToggle(getSensor())
&& DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, "mic_toggle_enabled", && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, "mic_toggle_enabled",
true) ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; true) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

4
src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java
View File

@@ -37,9 +37,7 @@ public class WorkPolicyInfoPreferenceController extends BasePreferenceController
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mEnterpriseProvider.hasWorkPolicyInfo() return mEnterpriseProvider.hasWorkPolicyInfo() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

8
tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.privacy; package com.android.settings.privacy;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -33,8 +33,8 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before; import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@@ -64,12 +64,12 @@ public class WorkPolicyInfoPreferenceControllerTest {
} }
@Test @Test
public void getAvailabilityStatus_haveWorkPolicyInfo_shouldReturnAvailableUnsearchable() { public void getAvailabilityStatus_haveWorkPolicyInfo_shouldReturnAvailable() {
when(mEnterpriseProvider.hasWorkPolicyInfo()).thenReturn(true); when(mEnterpriseProvider.hasWorkPolicyInfo()).thenReturn(true);
WorkPolicyInfoPreferenceController controller = WorkPolicyInfoPreferenceController controller =
new WorkPolicyInfoPreferenceController(mContext, "test_key"); new WorkPolicyInfoPreferenceController(mContext, "test_key");
assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
} }
@Test @Test