Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8a38babb: am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev

Browse Source 
* commit '8a38babb500d1b061fcf95b5d8e875bfca5c8c14':
  add metrics to assistant
This commit is contained in:
Chris Wren
2015-08-06 19:32:49 +00:00
committed by Android Git Automerger
parent f7a2eb5a8a 8a38babb50
commit fd18fc8686
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/logging/MetricsLogger.java
View File

@@ -28,6 +28,7 @@ import android.view.View;
public class MetricsLogger implements MetricsConstants { public class MetricsLogger implements MetricsConstants {
// Temporary constants go here, to await migration to MetricsConstants. // Temporary constants go here, to await migration to MetricsConstants.
// next value is 239; // next value is 239;
public static final int ACTION_ASSIST_LONG_PRESS = 239;
public static void visible(Context context, int category) throws IllegalArgumentException { public static void visible(Context context, int category) throws IllegalArgumentException {
if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) { if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -1056,6 +1056,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
if (shouldDisableNavbarGestures()) { if (shouldDisableNavbarGestures()) {
return false; return false;
} }
MetricsLogger.action(mContext, MetricsLogger.ACTION_ASSIST_LONG_PRESS);
mAssistManager.startAssist(new Bundle() /* args */); mAssistManager.startAssist(new Bundle() /* args */);
awakenDreams(); awakenDreams();
if (mNavigationBarView != null) { if (mNavigationBarView != null) {

3
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
View File

@@ -48,6 +48,7 @@ import android.view.WindowManager;
import com.android.internal.app.IAssistScreenshotReceiver; import com.android.internal.app.IAssistScreenshotReceiver;
import com.android.internal.app.IVoiceInteractionSessionShowCallback; import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.internal.app.IVoiceInteractor; import com.android.internal.app.IVoiceInteractor;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.os.IResultReceiver; import com.android.internal.os.IResultReceiver;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.statusbar.StatusBarManagerInternal; import com.android.server.statusbar.StatusBarManagerInternal;
@@ -225,6 +226,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
mSessionComponentName.getPackageName()) == AppOpsManager.MODE_ALLOWED mSessionComponentName.getPackageName()) == AppOpsManager.MODE_ALLOWED
&& structureEnabled) { && structureEnabled) {
try { try {
MetricsLogger.count(mContext, "assist_with_context", 1);
if (mAm.requestAssistContextExtras(ActivityManager.ASSIST_CONTEXT_FULL, if (mAm.requestAssistContextExtras(ActivityManager.ASSIST_CONTEXT_FULL,
mAssistReceiver, activityToken)) { mAssistReceiver, activityToken)) {
needDisclosure = true; needDisclosure = true;
@@ -249,6 +251,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
mSessionComponentName.getPackageName()) == AppOpsManager.MODE_ALLOWED mSessionComponentName.getPackageName()) == AppOpsManager.MODE_ALLOWED
&& screenshotEnabled) { && screenshotEnabled) {
try { try {
MetricsLogger.count(mContext, "assist_with_screen", 1);
needDisclosure = true; needDisclosure = true;
mIWindowManager.requestAssistScreenshot(mScreenshotReceiver); mIWindowManager.requestAssistScreenshot(mScreenshotReceiver);
} catch (RemoteException e) { } catch (RemoteException e) {