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

Manual merge of ag/2319717

Browse Source 
Bug: 62104030
Test: Manually tested as described in original commit msg.
Change-Id: Ie00bafa736c837881a258c9de10891b27c5baefd
This commit is contained in:
Phil Weaver
2017-05-30 10:41:52 -07:00
parent 8e0754e84c
commit 2e2dbfe549
5 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -26,8 +26,10 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.provider.Settings;
@@ -47,6 +49,8 @@ import com.android.settingslib.accessibility.AccessibilityUtils;
import java.util.List;
import static com.android.settings.Utils.setOverlayAllowed;
public class ToggleAccessibilityServicePreferenceFragment
extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
@@ -69,6 +73,8 @@ public class ToggleAccessibilityServicePreferenceFragment
private int mShownDialogId;
private final IBinder mToken = new Binder();
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_SERVICE;
@@ -99,12 +105,18 @@ public class ToggleAccessibilityServicePreferenceFragment
public void onResume() {
mSettingsContentObserver.register(getContentResolver());
updateSwitchBarToggleSwitch();
if (mToken != null) {
setOverlayAllowed(getActivity(), mToken, false);
}
super.onResume();
}
@Override
public void onPause() {
mSettingsContentObserver.unregister(getContentResolver());
if (mToken != null) {
setOverlayAllowed(getActivity(), mToken, true);
}
super.onPause();
}