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

Merge "NIU Actions: More specific permissions error codes" into sc-dev am: deeab12791 am: e4ec5ec830

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15055618

Change-Id: I21acfe342574af51900c75303c8fe443f135a474
This commit is contained in:
Rajeev Kumar
2021-06-22 03:57:06 +00:00
committed by Automerger Merge Worker
parent d07f9afe94 e4ec5ec830
commit c33b60b017
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+13 -8
View File
@@ -51,7 +51,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
public static final String ACTIONS_URL = "niu_actions_app_url"; public static final String ACTIONS_URL = "niu_actions_app_url";
public static final String ACTIONS_APP_PACKAGE = "niu_actions_app_package"; public static final String ACTIONS_APP_PACKAGE = "niu_actions_app_package";
public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code"; public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code";
public static final int ERROR_PERMISSIONS = 1; public static final int ERROR_PERMISSIONS_STRUCTURE = 1;
public static final int ERROR_PERMISSIONS_SCREENSHOT = 2;
private static final String TAG = "TaskOverlayFactoryGo"; private static final String TAG = "TaskOverlayFactoryGo";
private AssistContentRequester mContentRequester; private AssistContentRequester mContentRequester;
@@ -75,7 +76,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
private String mNIUPackageName; private String mNIUPackageName;
private String mTaskPackageName; private String mTaskPackageName;
private String mWebUrl; private String mWebUrl;
private boolean mAssistPermissionsEnabled; private boolean mAssistStructurePermitted;
private boolean mAssistScreenshotPermitted;
private AssistContentRequester mFactoryContentRequester; private AssistContentRequester mFactoryContentRequester;
private TaskOverlayGo(TaskThumbnailView taskThumbnailView, private TaskOverlayGo(TaskThumbnailView taskThumbnailView,
@@ -104,7 +106,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task)); getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
mTaskPackageName = task.key.getPackageName(); mTaskPackageName = task.key.getPackageName();
if (!mAssistPermissionsEnabled) { if (!mAssistStructurePermitted || !mAssistScreenshotPermitted) {
return; return;
} }
@@ -131,10 +133,14 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
private void sendNIUIntent(String actionType) { private void sendNIUIntent(String actionType) {
Intent intent = createNIUIntent(actionType); Intent intent = createNIUIntent(actionType);
// Only add and send the image if the appropriate permissions are held // Only add and send the image if the appropriate permissions are held
if (mAssistPermissionsEnabled) { if (mAssistStructurePermitted && mAssistScreenshotPermitted) {
mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent); mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
} else { } else {
intent.putExtra(ACTIONS_ERROR_CODE, ERROR_PERMISSIONS); // If both permissions are disabled, the structure error code takes priority
// The user must enable that one before they can enable screenshots
int code = mAssistStructurePermitted ? ERROR_PERMISSIONS_SCREENSHOT
: ERROR_PERMISSIONS_STRUCTURE;
intent.putExtra(ACTIONS_ERROR_CODE, code);
try { try {
mApplicationContext.startActivity(intent); mApplicationContext.startActivity(intent);
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
@@ -164,11 +170,10 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
@VisibleForTesting @VisibleForTesting
public void checkSettings() { public void checkSettings() {
ContentResolver contentResolver = mApplicationContext.getContentResolver(); ContentResolver contentResolver = mApplicationContext.getContentResolver();
boolean structureEnabled = Settings.Secure.getInt(contentResolver, mAssistStructurePermitted = Settings.Secure.getInt(contentResolver,
Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0; Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0;
boolean screenshotEnabled = Settings.Secure.getInt(contentResolver, mAssistScreenshotPermitted = Settings.Secure.getInt(contentResolver,
Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0; Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
mAssistPermissionsEnabled = structureEnabled && screenshotEnabled;
String assistantPackage = String assistantPackage =
Settings.Secure.getString(contentResolver, Settings.Secure.ASSISTANT); Settings.Secure.getString(contentResolver, Settings.Secure.ASSISTANT);