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

resolve merge conflicts of 94c5202965 to oc-dr1-dev

Browse Source 
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
This commit is contained in:
Phil Weaver
2017-08-29 13:36:21 -07:00
parent 683fdb8177 94c5202965
commit f65e790ba0
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -84,6 +84,7 @@
<uses-permission android:name="android.permission.DELETE_PACKAGES"/> <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
<uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/> <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
<uses-permission android:name="android.permission.NETWORK_SETTINGS" /> <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings" android:icon="@drawable/ic_launcher_settings"

8
src/com/android/settings/accessibility/AccessibilityServiceWarning.java
View File

@@ -27,6 +27,8 @@ import android.text.BidiFormatter;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@@ -37,6 +39,8 @@ import com.android.settings.R;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
/** /**
* Utility class for creating the dialog that asks users for explicit permission to grant * Utility class for creating the dialog that asks users for explicit permission to grant
* all of the requested capabilities to an accessibility service before the service is enabled * all of the requested capabilities to an accessibility service before the service is enabled
@@ -65,6 +69,10 @@ public class AccessibilityServiceWarning {
return false; return false;
}; };
Window window = ad.getWindow();
WindowManager.LayoutParams params = window.getAttributes();
params.privateFlags |= PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
window.setAttributes(params);
ad.create(); ad.create();
ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener); ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
ad.setCanceledOnTouchOutside(true); ad.setCanceledOnTouchOutside(true);

17
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static android.content.DialogInterface.BUTTON_POSITIVE; import static android.content.DialogInterface.BUTTON_POSITIVE;
import static com.android.settings.Utils.setOverlayAllowed; import static com.android.settings.Utils.setOverlayAllowed;
import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityServiceInfo;
@@ -146,22 +147,6 @@ public class ShortcutServicePickerFragment extends DefaultAppPickerFragment {
return AccessibilityServiceWarning.createCapabilitiesDialog(getActivity(), info, this); return AccessibilityServiceWarning.createCapabilitiesDialog(getActivity(), info, this);
} }
@Override
public void onResume() {
super.onResume();
if (mToken != null) {
setOverlayAllowed(getActivity(), mToken, false);
}
}
@Override
public void onPause() {
super.onPause();
if (mToken != null) {
setOverlayAllowed(getActivity(), mToken, true);
}
}
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
final Fragment fragment = getTargetFragment(); final Fragment fragment = getTargetFragment();

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

@@ -72,8 +72,6 @@ public class ToggleAccessibilityServicePreferenceFragment
private int mShownDialogId; private int mShownDialogId;
private final IBinder mToken = new Binder();
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_SERVICE; return MetricsEvent.ACCESSIBILITY_SERVICE;
@@ -96,18 +94,12 @@ public class ToggleAccessibilityServicePreferenceFragment
public void onResume() { public void onResume() {
mSettingsContentObserver.register(getContentResolver()); mSettingsContentObserver.register(getContentResolver());
updateSwitchBarToggleSwitch(); updateSwitchBarToggleSwitch();
if (mToken != null) {
setOverlayAllowed(getActivity(), mToken, false);
}
super.onResume(); super.onResume();
} }
@Override @Override
public void onPause() { public void onPause() {
mSettingsContentObserver.unregister(getContentResolver()); mSettingsContentObserver.unregister(getContentResolver());
if (mToken != null) {
setOverlayAllowed(getActivity(), mToken, true);
}
super.onPause(); super.onPause();
} }