gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-25 06:29:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

check if pip mode is granted on device, otherwise hide button

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-11-09 11:20:03 +01:00
parent 39a3c9edb5
commit f5106e6050
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -24,6 +24,7 @@ import android.Manifest;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.AppOpsManager;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.PictureInPictureParams; import android.app.PictureInPictureParams;
@ -310,7 +311,7 @@ public class CallActivity extends BaseActivity {
setCallState(CallStatus.CONNECTING); setCallState(CallStatus.CONNECTING);
} }
if (deviceSupportsPipMode()) { if (isGreaterEqualOreo() && isPipModePossible()) {
mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder(); mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
} }
@ -516,7 +517,7 @@ public class CallActivity extends BaseActivity {
binding.callInfosLinearLayout.setVisibility(View.VISIBLE); binding.callInfosLinearLayout.setVisibility(View.VISIBLE);
binding.selfVideoViewWrapper.setVisibility(View.VISIBLE); binding.selfVideoViewWrapper.setVisibility(View.VISIBLE);
if (!deviceSupportsPipMode()) { if (!isPipModePossible()) {
binding.pictureInPictureButton.setVisibility(View.GONE); binding.pictureInPictureButton.setVisibility(View.GONE);
} }
@ -2462,7 +2463,7 @@ public class CallActivity extends BaseActivity {
void enterPipMode() { void enterPipMode() {
enableKeyguard(); enableKeyguard();
if (deviceSupportsPipMode()) { if (isGreaterEqualOreo() && isPipModePossible()) {
Rational pipRatio = new Rational(300, 500); Rational pipRatio = new Rational(300, 500);
mPictureInPictureParamsBuilder.setAspectRatio(pipRatio); mPictureInPictureParamsBuilder.setAspectRatio(pipRatio);
enterPictureInPictureMode(mPictureInPictureParamsBuilder.build()); enterPictureInPictureMode(mPictureInPictureParamsBuilder.build());
@ -2471,9 +2472,21 @@ public class CallActivity extends BaseActivity {
} }
} }
private boolean deviceSupportsPipMode() { private boolean isPipModePossible() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O if (isGreaterEqualOreo()) {
&& getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE); boolean deviceHasPipFeature = getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
boolean isPipFeatureGranted = appOpsManager.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
android.os.Process.myUid(),
"com.nextcloud.talk2") == AppOpsManager.MODE_ALLOWED; // TODO: no hardcoding (-> branding!)
return deviceHasPipFeature && isPipFeatureGranted;
}
return false;
}
private boolean isGreaterEqualOreo(){
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
} }
@RequiresApi(api = Build.VERSION_CODES.O) @RequiresApi(api = Build.VERSION_CODES.O)
@ -2517,7 +2530,7 @@ public class CallActivity extends BaseActivity {
String title, String title,
int requestCode) { int requestCode) {
if (deviceSupportsPipMode()) { if (isGreaterEqualOreo() && isPipModePossible()) {
final ArrayList<RemoteAction> actions = new ArrayList<>(); final ArrayList<RemoteAction> actions = new ArrayList<>();
final Icon icon = Icon.createWithResource(this, iconId); final Icon icon = Icon.createWithResource(this, iconId);