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

Merge "Only enable feedback dialog in debuggable build." into qt-dev am: 3a9707b81a

Browse Source 
am: e2aea6ffcd

Change-Id: I1303bd76cd6764781242993ab9a9e04ab6de943f
This commit is contained in:
Yi-Ling Chuang
2019-04-09 10:48:54 -07:00
committed by android-build-merger
parent 3682bf3950 e2aea6ffcd
commit 3cffcbacab
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.homepage.contextualcards.slices;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
@@ -82,7 +83,7 @@ public class SliceContextualCardController implements ContextualCardController {
@VisibleForTesting
void showFeedbackDialog(ContextualCard card) {
final String email = mContext.getString(R.string.config_contextual_card_feedback_email);
if (TextUtils.isEmpty(email)) {
if (!isFeedbackEnabled(email)) {
return;
}
final Intent feedbackIntent = new Intent(mContext, ContextualCardFeedbackDialog.class);
@@ -93,6 +94,11 @@ public class SliceContextualCardController implements ContextualCardController {
mContext.startActivity(feedbackIntent);
}
@VisibleForTesting
boolean isFeedbackEnabled(String email) {
return !TextUtils.isEmpty(email) && Build.IS_DEBUGGABLE;
}
private String getSimpleCardName(ContextualCard card) {
final String[] split = card.getName().split("/");
return split[split.length - 1];