Merge "Hide esos setting if no app provides esos functionality" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-01-29 04:31:59 +00:00
committed by Android (Google) Code Review
2 changed files with 47 additions and 15 deletions

View File

@@ -62,7 +62,7 @@ public class EmergencyGestureEntrypointPreferenceController extends BasePreferen
@Override
public void updateState(Preference preference) {
super.updateState(preference);
final boolean canHandleClicks = !mUseCustomIntent || mIntent != null;
final boolean canHandleClicks = canHandleClicks();
if (preference != null) {
preference.setEnabled(canHandleClicks);
}
@@ -86,6 +86,9 @@ public class EmergencyGestureEntrypointPreferenceController extends BasePreferen
if (!isConfigEnabled) {
return UNSUPPORTED_ON_DEVICE;
}
if (!canHandleClicks()) {
return UNSUPPORTED_ON_DEVICE;
}
return AVAILABLE;
}
@@ -117,6 +120,13 @@ public class EmergencyGestureEntrypointPreferenceController extends BasePreferen
return mUseCustomIntent;
}
/**
* Whether or not this setting can react to user click
*/
private boolean canHandleClicks() {
return !mUseCustomIntent || mIntent != null;
}
private boolean canResolveIntent(Intent intent) {
final ResolveInfo resolveActivity = mContext.getPackageManager()
.resolveActivity(intent, 0);