From 94fc11af047c35aa07378080c0f8004fb10744c9 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Wed, 30 Oct 2019 18:00:20 +0800 Subject: Add show/hide launcher icon menu for debug This toggle muenu only show when debug mode enabled so it should not impact to normal users. Test: manual Test: atest DocumentsUIGoogleTests Change-Id: If1e73f4fe68f8b830b8e90f87d54513c3795d4c1 --- res/menu/activity.xml | 4 ++++ .../android/documentsui/AbstractActionHandler.java | 16 ++++++++++++++ src/com/android/documentsui/ActionHandler.java | 5 +++++ src/com/android/documentsui/BaseActivity.java | 4 ++++ src/com/android/documentsui/MenuManager.java | 5 +++++ src/com/android/documentsui/PreBootReceiver.java | 2 +- src/com/android/documentsui/base/Shared.java | 25 +++++++++++++++++----- src/com/android/documentsui/files/MenuManager.java | 8 +++++++ .../com/android/documentsui/testing/TestMenu.java | 1 + .../android/documentsui/files/MenuManagerTest.java | 3 +++ .../documentsui/picker/MenuManagerTest.java | 4 ++++ 11 files changed, 71 insertions(+), 6 deletions(-) diff --git a/res/menu/activity.xml b/res/menu/activity.xml index 5a729f27c..9e2fdd66f 100644 --- a/res/menu/activity.xml +++ b/res/menu/activity.xml @@ -80,5 +80,9 @@ android:title="@string/menu_inspect" android:visible="false" app:showAsAction="never"/> + diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java index 5b970993c..a20e3e7e4 100644 --- a/src/com/android/documentsui/AbstractActionHandler.java +++ b/src/com/android/documentsui/AbstractActionHandler.java @@ -21,9 +21,11 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString; import static com.android.documentsui.base.SharedMinimal.DEBUG; import android.app.PendingIntent; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentSender; +import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.Cursor; import android.net.Uri; @@ -452,6 +454,20 @@ public abstract class AbstractActionHandler